@gravity-ui/charts 1.46.1 → 1.48.0

package/dist/cjs/core/shapes/scatter/types.d.ts

@@ -1,4 +1,4 @@
-import type { HtmlItem, ScatterSeriesData } from '../../../types';
+import type { HtmlItem, LabelData, ScatterSeriesData } from '../../../types';
 import type { PreparedScatterSeries } from '../../series/types';
 type PointData = {
     x: number;
@@ -16,4 +16,9 @@ export type MarkerData = {
     clipped: boolean;
 };
 export type PreparedScatterData = MarkerData;
+export type PreparedScatterShapeData = {
+    markers: PreparedScatterData[];
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
+};
 export {};

package/dist/cjs/core/shapes/utils.d.ts

@@ -22,6 +22,30 @@ export declare function getYValue(args: {
     yAxis: PreparedYAxis;
     yScale: ChartScale;
 }): number | null;
+/**
+ * Hides out-of-range points from line/area path generators via `hiddenInLine`.
+ * Neighbors of in-range points are kept as anchors so the path retains its
+ * slope at the plot edges instead of stopping abruptly at the visible point.
+ *
+ * Pixel check alone is not enough: a degenerate/clamped scale domain (see the
+ * y-scale.ts guard) can map out-of-range data into the plot rectangle, leaving
+ * phantom hover targets. Pass `axisMin`/`axisMax` + `getDataY` to also reject
+ * points whose raw value is outside the user's intended range.
+ *
+ * Stacked shapes must NOT pass the data check — `point.data.y` is the unstacked
+ * value and doesn't reflect where the point actually lands on the plot.
+ */
+export declare function markHiddenPointsOutOfYRange<P extends {
+    y: number | null;
+    hiddenInLine?: boolean;
+}>(args: {
+    points: P[];
+    yScale: ChartScale;
+    yAxisTop: number;
+    axisMin?: number;
+    axisMax?: number;
+    getDataY?: (point: P) => unknown;
+}): void;
 export declare function shapeKey(d: unknown): string | number;
 export declare function setActiveState<T extends {
     active?: boolean;

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

@@ -53,6 +53,54 @@ export function getYValue(args) {
     }
     return point.y === null ? null : yLinearScale(point.y);
 }
+// Slack for d3 scale rounding (a `500` edge can come back as `499.9999`).
+// Half a pixel matches the ±0.5 of a 1px centered stroke and far exceeds any
+// plausible float error.
+const Y_RANGE_PIXEL_TOLERANCE = 0.5;
+/**
+ * Hides out-of-range points from line/area path generators via `hiddenInLine`.
+ * Neighbors of in-range points are kept as anchors so the path retains its
+ * slope at the plot edges instead of stopping abruptly at the visible point.
+ *
+ * Pixel check alone is not enough: a degenerate/clamped scale domain (see the
+ * y-scale.ts guard) can map out-of-range data into the plot rectangle, leaving
+ * phantom hover targets. Pass `axisMin`/`axisMax` + `getDataY` to also reject
+ * points whose raw value is outside the user's intended range.
+ *
+ * Stacked shapes must NOT pass the data check — `point.data.y` is the unstacked
+ * value and doesn't reflect where the point actually lands on the plot.
+ */
+export function markHiddenPointsOutOfYRange(args) {
+    const { points, yScale, yAxisTop, axisMin, axisMax, getDataY } = args;
+    const [yRangeA, yRangeB] = yScale.range();
+    const yMinPx = yAxisTop + Math.min(yRangeA, yRangeB);
+    const yMaxPx = yAxisTop + Math.max(yRangeA, yRangeB);
+    const hasDataBoundsCheck = Boolean(getDataY) && (typeof axisMin === 'number' || typeof axisMax === 'number');
+    const isInRange = (point) => {
+        if (point.y === null) {
+            return false;
+        }
+        if (hasDataBoundsCheck) {
+            const dataY = getDataY === null || getDataY === void 0 ? void 0 : getDataY(point);
+            if (typeof dataY === 'number') {
+                if (typeof axisMin === 'number' && dataY < axisMin) {
+                    return false;
+                }
+                if (typeof axisMax === 'number' && dataY > axisMax) {
+                    return false;
+                }
+            }
+        }
+        return (point.y >= yMinPx - Y_RANGE_PIXEL_TOLERANCE &&
+            point.y <= yMaxPx + Y_RANGE_PIXEL_TOLERANCE);
+    };
+    const inRange = points.map(isInRange);
+    for (let idx = 0; idx < points.length; idx++) {
+        if (!inRange[idx] && !inRange[idx - 1] && !inRange[idx + 1]) {
+            points[idx].hiddenInLine = true;
+        }
+    }
+}
 export function shapeKey(d) {
     return d.id || -1;
 }

package/dist/cjs/core/shapes/waterfall/renderer.js

@@ -5,6 +5,7 @@ import get from 'lodash/get';
 import { block } from '../../../utils';
 import { DASH_STYLE } from '../../constants';
 import { filterOverlappingLabels, getLineDashArray, getWaterfallPointColor } from '../../utils';
+import { renderDataLabels } from '../data-labels';
 const b = block('waterfall');
 export function renderWaterfall(elements, preparedData, seriesOptions, allowOverlapDataLabels, dispatcher) {
     const svgElement = select(elements.plot);
@@ -28,18 +29,11 @@ export function renderWaterfall(elements, preparedData, seriesOptions, allowOver
     if (!allowOverlapDataLabels) {
         dataLabels = filterOverlappingLabels(dataLabels);
     }
-    const labelSelection = svgElement
-        .selectAll('text')
-        .data(dataLabels)
-        .join('text')
-        .html((d) => d.text)
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .attr('text-anchor', (d) => d.textAnchor)
-        .style('font-size', (d) => d.style.fontSize)
-        .style('font-weight', (d) => d.style.fontWeight || null)
-        .style('fill', (d) => d.style.fontColor || null);
+    const labelSelection = renderDataLabels({
+        container: svgElement,
+        data: dataLabels,
+        className: b('label'),
+    });
     // Add the connector line between bars
     svgElement
         .selectAll(connectorSelector)

package/dist/cjs/core/shapes/x-range/renderer.js

@@ -4,6 +4,7 @@ import get from 'lodash/get';
 import { block } from '../../../utils';
 import { getRectPath } from '../../shapes/utils';
 import { getLineDashArray } from '../../utils';
+import { renderDataLabels } from '../data-labels';
 const b = block('x-range');
 export function renderXRange(elements, preparedData, seriesOptions, dispatcher) {
     const svgElement = select(elements.plot);
@@ -48,20 +49,13 @@ export function renderXRange(elements, preparedData, seriesOptions, dispatcher)
         .attr('opacity', (d) => { var _a; return (_a = d.data.opacity) !== null && _a !== void 0 ? _a : d.series.opacity; })
         .attr('pointer-events', 'none');
     const svgLabels = preparedData.flatMap((d) => d.svgLabels);
-    svgElement
-        .selectAll(`text.${b('label')}`)
-        .data(svgLabels)
-        .join('text')
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .attr('text-anchor', (d) => d.textAnchor)
+    renderDataLabels({
+        container: svgElement,
+        data: svgLabels,
+        className: b('label'),
+    })
         .attr('dominant-baseline', 'central')
-        .attr('pointer-events', 'none')
-        .style('font-size', (d) => d.style.fontSize)
-        .style('font-weight', (d) => d.style.fontWeight || null)
-        .style('fill', (d) => d.style.fontColor || null)
-        .html((d) => d.text);
+        .attr('pointer-events', 'none');
     const hoverOptions = get(seriesOptions, 'x-range.states.hover');
     const inactiveOptions = get(seriesOptions, 'x-range.states.inactive');
     function handleShapeHover(data) {

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

@@ -317,6 +317,7 @@ export interface AxisPlotShape extends AxisPlot {
         plotHeight: number;
     }) => string;
 }
+export type PlotBandAlign = 'start' | 'end';
 export interface AxisPlotBand extends AxisPlot {
     /**
      * The start position of the plot band in axis units.
@@ -336,6 +337,25 @@ export interface AxisPlotBand extends AxisPlot {
      * If the value is `Infinity` or `null`, it will be treated as the end of the axis.
      */
     to: number | string | null;
+    /**
+     * Anchor side on the perpendicular axis when `size` is set.
+     *
+     * - `'start'` — the band sticks to the main axis line (bottom for an X axis,
+     *   left for a left Y axis, right for a right Y axis).
+     * - `'end'` — the band sticks to the opposite side of the plot area.
+     *
+     * Has no effect without `size`.
+     * @default 'start'
+     */
+    align?: PlotBandAlign;
+    /**
+     * Perpendicular extent of the band.
+     *
+     * Accepts a pixel number (`40`), a pixel string (`"40px"`), or a percentage of
+     * the perpendicular plot extent (`"25%"`). When omitted, the band spans the
+     * full perpendicular extent of the plot area (default behavior).
+     */
+    size?: number | string;
 }
 export interface AxisCrosshair extends Pick<AxisPlotLine, 'color' | 'dashStyle' | 'opacity' | 'layerPlacement' | 'width'> {
     /**

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

@@ -12,7 +12,6 @@ export type CustomFormat = {
     type: 'custom';
     formatter: (args: {
         value: unknown;
-        formattedValue?: string;
     }) => string;
 };
 /**
@@ -20,7 +19,10 @@ export type CustomFormat = {
  *
  * - `{ type: 'number' }` — numeric formatting with optional precision, units, percent display, etc.
  * See [FormatNumberOptions](https://gravity-ui.github.io/charts/pages/api/Utilities/interfaces/FormatNumberOptions.html) for all available options.
- * - `{ type: 'date' }` — date/time formatting
+ * - `{ type: 'date' }` — date/time formatting.
+ * - `{ type: 'custom' }` — user-defined formatter function. Receives the raw `value`
+ *   and returns the display string. Use it when the built-in number/date formatters
+ *   are not enough (e.g. bytes → KB/MB/GB, currency with locale, etc.).
  * @example
  * // Two decimal places, shown as percent
  * { type: 'number', precision: 2, format: 'percent' }
@@ -30,8 +32,20 @@ export type CustomFormat = {
  * @example
  * // Date value (Unix ms) formatted as "17 October 2025"
  * { type: 'date', format: 'DD MMMM YYYY' }
+ * @example
+ * // Bytes → human-readable size
+ * {
+ *   type: 'custom',
+ *   formatter: ({value}) => {
+ *     const bytes = Number(value);
+ *     if (!Number.isFinite(bytes)) return String(value);
+ *     const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+ *     const i = Math.min(units.length - 1, Math.floor(Math.log(Math.abs(bytes) || 1) / Math.log(1024)));
+ *     return `${(bytes / 1024 ** i).toFixed(1)} ${units[i]}`;
+ *   },
+ * }
  */
-export type ValueFormat = NumberFormat | DateFormat;
+export type ValueFormat = NumberFormat | DateFormat | CustomFormat;
 export interface BaseDataLabels {
     /**
      * Enable or disable the data labels

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

@@ -23,6 +23,8 @@ export interface ScatterSeriesData<T = MeaningfulAny> extends BaseSeriesData<T>
      * @deprecated use `x` or `y` instead
      */
     category?: string;
+    /** Data label value of the point. If not specified, the y value is used. */
+    label?: string | number;
     /** Individual radius for the point. */
     radius?: number;
     /** Individual opacity for the point. */

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

@@ -5,7 +5,7 @@ import type { AreaSeries, AreaSeriesData } from './area';
 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';
+import type { ValueFormat } from './base';
 import type { FunnelSeries, FunnelSeriesData } from './funnel';
 import type { HeatmapSeries, HeatmapSeriesData } from './heatmap';
 import type { LineSeries, LineSeriesData } from './line';
@@ -107,7 +107,7 @@ export interface ChartTooltipRendererArgs<T = MeaningfulAny> {
     xAxis?: ChartXAxis | null;
     yAxis?: ChartYAxis;
     /** Formatting settings for tooltip header row (includes computed default). */
-    headerFormat?: ValueFormat | CustomFormat;
+    headerFormat?: ValueFormat;
 }
 export interface ChartTooltipTotalsAggregationArgs<T = MeaningfulAny> extends ChartTooltipRendererArgs<T> {
 }
@@ -167,7 +167,7 @@ export interface ChartTooltip<T = MeaningfulAny> {
     /** Formatting settings for tooltip value. */
     valueFormat?: ValueFormat;
     /** Formatting settings for tooltip header row. */
-    headerFormat?: ValueFormat | CustomFormat;
+    headerFormat?: ValueFormat;
     /** Settings for totals block in tooltip */
     totals?: {
         /**

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

@@ -1,40 +1 @@
-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;
-}
-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.
-     */
-    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.
-     */
-    unit?: 'auto' | 'k' | 'm' | 'b' | 't' | null;
-}
+export type { FormatNumberOptions, FormatOptions, FormatUnitScale, FormatUnitScaleEntry, } from '../../libs/format-number/types';

package/dist/cjs/core/utils/data-labels.d.ts

@@ -0,0 +1,46 @@
+import type { HtmlItem, LabelData } from '../../types';
+import type { BaseTextStyle, ValueFormat } from '../types/chart/base';
+type PointLabelSeries = {
+    id: string;
+    dataLabels: {
+        style: BaseTextStyle;
+        html: boolean;
+        padding: number;
+        format?: ValueFormat;
+    };
+};
+type LabelPoint = {
+    x: number | null;
+    y: number | null;
+    data: {
+        label?: string | number | null;
+        y?: string | number | null;
+    };
+};
+/**
+ * Shared "above-point" dataLabels algorithm used by line, area, and scatter series.
+ *
+ * For each visible point it:
+ * 1. Formats the value via getFormattedValue
+ * 2. Measures the label size (HTML → getLabelsSize, SVG → getTextSizeFn)
+ * 3. Positions the label centered above the point, clamped to chart bounds
+ *
+ * `anchorYOffset` shifts the vertical anchor from the point center upward by the given
+ * number of pixels (e.g. marker radius for scatter), so padding is measured from the
+ * marker edge rather than its center. The top-boundary clamp also respects this offset
+ * so the label never drops below the anchor.
+ *
+ * Overlap filtering is intentionally left to the caller.
+ */
+export declare function preparePointDataLabels<S extends PointLabelSeries, P extends LabelPoint>({ series, points, xMax, yAxisTop, isOutsideBounds, anchorYOffset, }: {
+    series: S;
+    points: P[];
+    xMax: number;
+    yAxisTop: number;
+    isOutsideBounds: (x: number, y: number) => boolean;
+    anchorYOffset?: number;
+}): Promise<{
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
+}>;
+export {};

package/dist/cjs/core/utils/data-labels.js

@@ -0,0 +1,64 @@
+import { getFormattedValue } from './format';
+import { getLabelsSize, getTextSizeFn } from './text';
+/**
+ * Shared "above-point" dataLabels algorithm used by line, area, and scatter series.
+ *
+ * For each visible point it:
+ * 1. Formats the value via getFormattedValue
+ * 2. Measures the label size (HTML → getLabelsSize, SVG → getTextSizeFn)
+ * 3. Positions the label centered above the point, clamped to chart bounds
+ *
+ * `anchorYOffset` shifts the vertical anchor from the point center upward by the given
+ * number of pixels (e.g. marker radius for scatter), so padding is measured from the
+ * marker edge rather than its center. The top-boundary clamp also respects this offset
+ * so the label never drops below the anchor.
+ *
+ * Overlap filtering is intentionally left to the caller.
+ */
+export async function preparePointDataLabels({ series, points, xMax, yAxisTop, isOutsideBounds, anchorYOffset = 0, }) {
+    var _a;
+    const svgLabels = [];
+    const htmlLabels = [];
+    const getTextSize = getTextSizeFn({ style: series.dataLabels.style });
+    for (let i = 0; i < points.length; i++) {
+        const point = points[i];
+        if (point.y === null || point.x === null || isOutsideBounds(point.x, point.y)) {
+            continue;
+        }
+        const text = getFormattedValue(Object.assign({ value: (_a = point.data.label) !== null && _a !== void 0 ? _a : point.data.y }, series.dataLabels));
+        const anchorY = point.y - anchorYOffset;
+        if (series.dataLabels.html) {
+            const size = await getLabelsSize({
+                labels: [text],
+                style: series.dataLabels.style,
+                html: true,
+            });
+            const width = size.maxWidth;
+            const height = size.maxHeight;
+            htmlLabels.push({
+                x: Math.min(xMax - width, Math.max(0, point.x - width / 2)),
+                y: Math.max(yAxisTop, anchorY - series.dataLabels.padding - height),
+                content: text,
+                size: { width, height },
+                style: series.dataLabels.style,
+            });
+        }
+        else {
+            const labelSize = await getTextSize(text);
+            svgLabels.push({
+                text,
+                x: Math.min(xMax - labelSize.width, Math.max(0, point.x - labelSize.width / 2)),
+                y: Math.max(yAxisTop, anchorY -
+                    series.dataLabels.padding -
+                    labelSize.height +
+                    labelSize.hangingOffset),
+                style: series.dataLabels.style,
+                size: labelSize,
+                textAnchor: 'start',
+                series,
+                active: true,
+            });
+        }
+    }
+    return { svgLabels, htmlLabels };
+}

package/dist/cjs/core/utils/format.d.ts

@@ -1,9 +1,9 @@
 import type { AxisDomain } from 'd3-axis';
-import type { CustomFormat, ValueFormat } from '../../types';
+import type { ValueFormat } from '../../types';
 import type { PreparedAxis } from '../axes/types';
 export declare function getFormattedValue(args: {
     value: string | number | undefined | null;
-    format?: ValueFormat | CustomFormat;
+    format?: ValueFormat;
 }): string;
 export declare function formatAxisTickLabel(args: {
     axis: PreparedAxis;

package/dist/cjs/core/utils/get-closest-data.js

@@ -68,7 +68,7 @@ export function getClosestPoints(args) {
             case 'line': {
                 const linePoints = list.reduce((acc, d) => {
                     acc.push(...d.points.reduce((accPoints, p) => {
-                        if (p.y !== null && p.x !== null) {
+                        if (p.y !== null && p.x !== null && !p.hiddenInLine) {
                             accPoints.push({
                                 data: p.data,
                                 series: p.series,
@@ -86,13 +86,18 @@ export function getClosestPoints(args) {
             }
             case 'area': {
                 const areaPoints = list.reduce((acc, d) => {
-                    Array.prototype.push.apply(acc, d.points.map((p) => ({
-                        data: p.data,
-                        series: p.series,
-                        x: p.x,
-                        y0: p.y0,
-                        y1: p.y,
-                    })));
+                    for (const p of d.points) {
+                        if (p.y === null || p.hiddenInLine) {
+                            continue;
+                        }
+                        acc.push({
+                            data: p.data,
+                            series: p.series,
+                            x: p.x,
+                            y0: p.y0,
+                            y1: p.y,
+                        });
+                    }
                     return acc;
                 }, []);
                 closestPointsByXValue.push(...areaPoints);

package/dist/cjs/core/utils/index.d.ts

@@ -15,3 +15,4 @@ export * from '../layout/chart-dimensions';
 export * from './common';
 export * from './misc';
 export * from './dispatcher';
+export * from './data-labels';

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

@@ -15,3 +15,4 @@ export * from '../layout/chart-dimensions';
 export * from './common';
 export * from './misc';
 export * from './dispatcher';
+export * from './data-labels';

package/dist/cjs/core/zoom/index.d.ts

@@ -1 +1,3 @@
+export * from './types';
+export * from './utils';
 export * from './zoom';

package/dist/cjs/core/zoom/index.js

@@ -1 +1,3 @@
+export * from './types';
+export * from './utils';
 export * from './zoom';

package/dist/{esm/hooks/useZoom → cjs/core/zoom}/utils.d.ts

@@ -1,7 +1,7 @@
 import type { BrushSelection } from 'd3-brush';
-import type { ZoomType } from '../../core/constants';
-import type { ChartScale } from '../../core/scales/types';
-import type { PreparedXAxis, PreparedYAxis } from '../useAxis/types';
+import type { PreparedXAxis, PreparedYAxis } from '../axes/types';
+import type { ZoomType } from '../constants';
+import type { ChartScale } from '../scales/types';
 import type { ZoomState } from './types';
 export declare function selectionToZoomBounds(args: {
     selection: BrushSelection;

package/dist/{esm/hooks/useZoom → cjs/core/zoom}/utils.js

@@ -1,4 +1,4 @@
-import { ZOOM_TYPE } from '../../core/constants';
+import { ZOOM_TYPE } from '../constants';
 export function selectionToZoomBounds(args) {
     const { selection, xAxis, xScale, yAxes, yScales, zoomType } = args;
     const zoomState = {};

package/dist/cjs/core/zoom/zoom.d.ts

@@ -1,8 +1,8 @@
-import type { RangeSliderState } from '../../hooks';
-import type { ZoomState } from '../../hooks/useZoom/types';
-import type { ChartXAxis, ChartYAxis } from '../../types';
 import type { PreparedXAxis, PreparedYAxis } from '../axes/types';
+import type { RangeSliderState } from '../range-slider/types';
 import type { PreparedSeries } from '../series';
+import type { ChartXAxis, ChartYAxis } from '../types';
+import type { ZoomState } from './types';
 export declare function getZoomedSeriesData(args: {
     seriesData: PreparedSeries[];
     zoomState: Partial<ZoomState>;

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

@@ -3,7 +3,7 @@ export * from '../core/axes/types';
 export * from './useAxisScales';
 export * from '../core/scales/types';
 export * from './useBrush';
-export * from './useBrush/types';
+export * from '../core/brush/types';
 export * from './useCrosshair';
 export * from './usePrevious';
 export * from './useRangeSlider';
@@ -15,5 +15,5 @@ export * from '../core/layout/split';
 export * from '../core/layout/split-types';
 export * from './useTooltip';
 export * from './useZoom';
-export * from './useZoom/types';
+export * from '../core/zoom/types';
 export * from './types';

package/dist/cjs/hooks/index.js

@@ -3,7 +3,7 @@ export * from '../core/axes/types';
 export * from './useAxisScales';
 export * from '../core/scales/types';
 export * from './useBrush';
-export * from './useBrush/types';
+export * from '../core/brush/types';
 export * from './useCrosshair';
 export * from './usePrevious';
 export * from './useRangeSlider';
@@ -15,5 +15,5 @@ export * from '../core/layout/split';
 export * from '../core/layout/split-types';
 export * from './useTooltip';
 export * from './useZoom';
-export * from './useZoom/types';
+export * from '../core/zoom/types';
 export * from './types';

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

@@ -1,13 +1,7 @@
 import type { TextRowData } from '../components/types';
-import type { BaseTextStyle, ChartBrush, ChartData, ChartMargin, ChartTitle, ChartZoom, DeepRequired } from '../types';
+import type { BaseTextStyle, ChartData, ChartTitle } from '../types';
 import type { HtmlItem } from '../types/chart-ui';
-export type PreparedZoom = DeepRequired<Omit<ChartZoom, 'enabled' | 'brush'>> & DeepRequired<{
-    brush: ChartBrush;
-}>;
-export type PreparedChart = {
-    margin: ChartMargin;
-    zoom: PreparedZoom | null;
-};
+export type { PreparedChart, PreparedZoom } from '../core/chart/types';
 export type PreparedTitle = Omit<ChartTitle, 'margin' | 'style'> & {
     height: number;
     margin: number;

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

@@ -1,3 +1,3 @@
-import type { UseBrushProps } from './types';
+import type { UseBrushProps } from '../../core/brush/types';
 import './styles.css';
 export declare function useBrush(props: UseBrushProps): void;

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import { brush, brushX, brushY } from 'd3-brush';
 import { pointer, select } from 'd3-selection';
+import { getDefaultSelection, getNormalizedSelection, setBrushBorder, setBrushHandles, } from '../../core/brush/utils';
 import { block } from '../../utils';
-import { getDefaultSelection, getNormalizedSelection, setBrushBorder, setBrushHandles, } from './utils';
 import './styles.css';
 const b = block('brush');
 export function useBrush(props) {

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

@@ -1,14 +1,14 @@
 import React from 'react';
 import { pointer } from 'd3-selection';
 import { isEqual } from 'lodash';
+import { getNormalizedSelection, isOneDimensionalSelection } from '../../core/brush/utils';
 import { SERIES_TYPE } from '../../core/constants';
+import { getRangeSliderOffsetTop, getRangeSliderSelection } from '../../core/range-slider/utils';
 import { isBandScale } from '../../core/utils';
+import { selectionToZoomBounds } from '../../core/zoom/utils';
 import { useAxis } from '../useAxis';
 import { useAxisScales } from '../useAxisScales';
-import { getNormalizedSelection, isOneDimensionalSelection } from '../useBrush/utils';
 import { useShapes } from '../useShapes';
-import { selectionToZoomBounds } from '../useZoom/utils';
-import { getRangeSliderOffsetTop, getRangeSliderSelection } from './utils';
 export const EMPTY_PREPARED_SPLIT = {
     plots: [],
     gap: 0,

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

@@ -1,13 +1,11 @@
+import type { PreparedRangeSlider, PreparedXAxis, PreparedYAxis } from '../../core/axes/types';
+import type { BrushSelection, UseBrushProps } from '../../core/brush/types';
+import type { PreparedChart } from '../../core/chart/types';
+import type { RangeSliderState } from '../../core/range-slider/types';
 import type { ChartScale } from '../../core/scales/types';
 import type { PreparedLegend, PreparedSeries, PreparedSeriesOptions } from '../../core/series/types';
 import type { ChartXAxis, ChartYAxis, LegendConfig } from '../../types';
-import type { PreparedChart } from '../types';
-import type { PreparedRangeSlider, PreparedXAxis, PreparedYAxis } from '../useAxis/types';
-import type { BrushSelection, UseBrushProps } from '../useBrush/types';
-export type RangeSliderState = {
-    max: number;
-    min: number;
-};
+export type { RangeSliderState };
 export interface RangeSliderProps {
     activeLegendItems: string[];
     boundsOffsetLeft: number;