@wavemaker/react-native-echarts 1.0.0-dev.1 → 1.0.0-dev.11

package/cartesian/tooltip/axis-tooltip.utils.js

@@ -0,0 +1,121 @@
+function isCategoryAxisEntry(a) {
+    return String(a?.axisType ?? '').toLowerCase() === 'category';
+}
+function hasSeriesIndices(a) {
+    return Array.isArray(a?.seriesDataIndices) && a.seriesDataIndices.length > 0;
+}
+/** First numeric `dataIndex` carried on the axis tooltip batch (the authoritative index for that axis). */
+function dataIndexFromSeriesDataIndices(indices) {
+    if (!Array.isArray(indices))
+        return undefined;
+    for (const item of indices) {
+        const d = item?.dataIndex;
+        if (typeof d === 'number' && !Number.isNaN(d))
+            return d;
+    }
+    return undefined;
+}
+function seriesDataIndicesFromShowTipEvt(evt, categoryAxisIsY) {
+    const axes = evt?.dataByCoordSys?.[0]?.dataByAxis;
+    if (!Array.isArray(axes) || axes.length === 0)
+        return null;
+    const categoryAxes = axes.filter(isCategoryAxisEntry);
+    if (categoryAxes.length === 1) {
+        const axisEntry = categoryAxes[0];
+        return {
+            indices: Array.isArray(axisEntry.seriesDataIndices) ? axisEntry.seriesDataIndices : [],
+            axisEntry,
+        };
+    }
+    if (categoryAxes.length > 1 && categoryAxisIsY != null) {
+        const dim = categoryAxisIsY ? 'y' : 'x';
+        const axisEntry = categoryAxes.find((a) => a?.axisDim === dim && hasSeriesIndices(a)) ??
+            categoryAxes.find((a) => a?.axisDim === dim) ??
+            categoryAxes[0];
+        return {
+            indices: Array.isArray(axisEntry.seriesDataIndices) ? axisEntry.seriesDataIndices : [],
+            axisEntry,
+        };
+    }
+    if (categoryAxisIsY === true) {
+        const yWith = axes.find((a) => a?.axisDim === 'y' && hasSeriesIndices(a));
+        if (yWith)
+            return { indices: yWith.seriesDataIndices, axisEntry: yWith };
+        const yAxis = axes.find((a) => a?.axisDim === 'y');
+        if (yAxis)
+            return { indices: Array.isArray(yAxis.seriesDataIndices) ? yAxis.seriesDataIndices : [], axisEntry: yAxis };
+        return null;
+    }
+    if (categoryAxisIsY === false) {
+        const xWith = axes.find((a) => a?.axisDim === 'x' && hasSeriesIndices(a));
+        if (xWith)
+            return { indices: xWith.seriesDataIndices, axisEntry: xWith };
+        const xAxis = axes.find((a) => a?.axisDim === 'x');
+        if (xAxis)
+            return { indices: Array.isArray(xAxis.seriesDataIndices) ? xAxis.seriesDataIndices : [], axisEntry: xAxis };
+        return null;
+    }
+    const preferred = axes.find((a) => a?.axisDim === 'x' && hasSeriesIndices(a));
+    const fallback = axes.find((a) => hasSeriesIndices(a));
+    const axisEntry = preferred ?? fallback ?? axes[0];
+    const indices = axisEntry?.seriesDataIndices;
+    if (!Array.isArray(indices) || indices.length === 0)
+        return null;
+    return { indices, axisEntry };
+}
+/** Build axis tooltip params from an ECharts `showTip` dispatch payload. */
+export function axisTooltipParamsFromShowTipEvent(evt, ctx, seriesTheme) {
+    const pointerX = evt?.x;
+    const pointerY = evt?.y;
+    if (typeof pointerX !== 'number' || typeof pointerY !== 'number')
+        return null;
+    if (Number.isNaN(pointerX) || Number.isNaN(pointerY))
+        return null;
+    const picked = seriesDataIndicesFromShowTipEvt(evt, ctx.categoryAxisIsY);
+    if (picked == null)
+        return null;
+    const { indices, axisEntry } = picked;
+    const dataIndexRaw = dataIndexFromSeriesDataIndices(indices) ??
+        (typeof axisEntry?.dataIndex === 'number' && !Number.isNaN(axisEntry.dataIndex)
+            ? axisEntry.dataIndex
+            : undefined) ??
+        (typeof evt?.dataIndex === 'number' && !Number.isNaN(evt.dataIndex) ? evt.dataIndex : undefined) ??
+        0;
+    const { displaySeries: ds, categoryAxisData: cats } = ctx;
+    if (!ds?.length || dataIndexRaw < 0)
+        return null;
+    const indicesForSeries = Array.isArray(indices) && indices.length > 0
+        ? indices
+        : ds.map((_, seriesIndex) => ({ seriesIndex, dataIndex: dataIndexRaw }));
+    const axisValue = cats[dataIndexRaw] ?? dataIndexRaw;
+    const themeLen = Math.max(seriesTheme.length, 1);
+    const series = indicesForSeries.map((item) => {
+        const seriesIndex = typeof item.seriesIndex === 'number' ? item.seriesIndex : 0;
+        const s = ds[seriesIndex];
+        const seriesName = s?.name != null && s.name !== '' ? String(s.name) : `Series ${seriesIndex + 1}`;
+        let value = 0;
+        const pt = s?.data?.[dataIndexRaw];
+        if (typeof pt === 'number')
+            value = pt;
+        else if (Array.isArray(pt) && pt.length >= 2)
+            value = Number(pt[1]);
+        const color = seriesTheme[seriesIndex % themeLen]?.color;
+        return {
+            seriesName,
+            value,
+            seriesIndex,
+            ...(typeof color === 'string' ? { color } : {}),
+        };
+    });
+    return {
+        axisValue,
+        dataIndex: dataIndexRaw,
+        series,
+        pointerX,
+        pointerY,
+    };
+}
+/** Spread onto ECharts `tooltip` when using an RN overlay (`showTip` / `hideTip` still fire). */
+export function axisTooltipShowContentFlag(useCustomTooltipOverlay) {
+    return { showContent: !useCustomTooltipOverlay };
+}

package/cartesian/tooltip/default-axis-tooltip.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { ChartTheme } from '../../chart-theme.context';
+import type { AxisTooltipParams } from './axis-tooltip.types';
+/**
+ * Themed default axis tooltip as React Native (mirrors the former ECharts tooltip styling).
+ * Pass the result of this factory to {@link useAxisTooltip} when the consumer does not pass `renderTooltip`.
+ */
+export declare function createDefaultAxisTooltip(theme: Pick<ChartTheme, 'tooltip'>): (params: AxisTooltipParams) => React.ReactElement;
+//# sourceMappingURL=default-axis-tooltip.d.ts.map

package/cartesian/tooltip/default-axis-tooltip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-axis-tooltip.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/default-axis-tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GACjC,CAAC,MAAM,EAAE,iBAAiB,KAAK,KAAK,CAAC,YAAY,CA8BnD"}

package/cartesian/tooltip/default-axis-tooltip.js

@@ -0,0 +1,53 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+/**
+ * Themed default axis tooltip as React Native (mirrors the former ECharts tooltip styling).
+ * Pass the result of this factory to {@link useAxisTooltip} when the consumer does not pass `renderTooltip`.
+ */
+export function createDefaultAxisTooltip(theme) {
+    const t = theme.tooltip;
+    return function DefaultAxisTooltip(params) {
+        return (<View style={{
+                backgroundColor: t.backgroundColor,
+                borderColor: t.borderColor,
+                borderWidth: t.borderWidth,
+                borderRadius: t.borderRadius,
+                padding: t.padding,
+            }}>
+        <Text style={[styles.axisTitle, { color: t.labelColor }]}>{String(params.axisValue)}</Text>
+        {params.series.map((item) => (<View key={item.seriesIndex} style={styles.row}>
+            {item.color != null && item.color !== '' ? (<View style={[styles.swatch, { backgroundColor: item.color }]}/>) : (<View style={styles.swatchPlaceholder}/>)}
+            <Text style={[styles.valueLine, { color: t.valueColor }]}>
+              <Text style={{ color: t.labelColor }}>{item.seriesName}: </Text>
+              {String(item.value)}
+            </Text>
+          </View>))}
+      </View>);
+    };
+}
+const styles = StyleSheet.create({
+    axisTitle: {
+        fontWeight: '600',
+        marginBottom: 4,
+    },
+    row: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        marginTop: 2,
+    },
+    swatch: {
+        width: 8,
+        height: 8,
+        borderRadius: 4,
+        marginRight: 6,
+    },
+    swatchPlaceholder: {
+        width: 8,
+        height: 8,
+        marginRight: 6,
+    },
+    valueLine: {
+        fontSize: 12,
+        flex: 1,
+    },
+});

package/cartesian/tooltip/index.d.ts

@@ -0,0 +1,7 @@
+export { createDefaultAxisTooltip } from './default-axis-tooltip';
+export { createAxisTooltipPreset } from './axis-tooltip-presets';
+export type { AxisTooltipContentParams, AxisTooltipContext, AxisTooltipParams, AxisTooltipSeriesItem, } from './axis-tooltip.types';
+export { axisTooltipShowContentFlag, axisTooltipParamsFromShowTipEvent } from './axis-tooltip.utils';
+export { AxisTooltipOverlay, useAxisTooltip } from './use-axis-tooltip';
+export type { AxisTooltipOverlayProps, UseAxisTooltipOptions, UseAxisTooltipResult } from './use-axis-tooltip';
+//# sourceMappingURL=index.d.ts.map

package/cartesian/tooltip/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,YAAY,EACV,wBAAwB,EACxB,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,0BAA0B,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACxE,YAAY,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}

package/cartesian/tooltip/index.js

@@ -0,0 +1,4 @@
+export { createDefaultAxisTooltip } from './default-axis-tooltip';
+export { createAxisTooltipPreset } from './axis-tooltip-presets';
+export { axisTooltipShowContentFlag, axisTooltipParamsFromShowTipEvent } from './axis-tooltip.utils';
+export { AxisTooltipOverlay, useAxisTooltip } from './use-axis-tooltip';

package/cartesian/tooltip/use-axis-tooltip.d.ts

@@ -0,0 +1,38 @@
+import React from 'react';
+import type { AxisTooltipContext, AxisTooltipParams } from './axis-tooltip.types';
+export interface AxisTooltipOverlayProps {
+    width: number;
+    height: number;
+    params: AxisTooltipParams | null;
+    children: (params: AxisTooltipParams) => React.ReactNode;
+}
+/** Presentational overlay; use with your own state if you do not use the hook. */
+export declare function AxisTooltipOverlay({ width, height, params, children }: AxisTooltipOverlayProps): React.JSX.Element | null;
+export interface UseAxisTooltipOptions {
+    /**
+     * When true, registers `showTip` / `hideTip` listeners and drives the overlay.
+     * Typically matches whether the chart shows the RN tooltip overlay (see chart `tooltip` / `renderTooltip`).
+     */
+    active: boolean;
+    /** Resolved renderer (include {@link createDefaultAxisTooltip} when the consumer does not pass one). */
+    renderTooltip: (params: AxisTooltipParams) => React.ReactNode;
+    contextRef: React.RefObject<AxisTooltipContext>;
+    themeSeriesRef: React.RefObject<Array<{
+        color: string;
+    }>>;
+    width: number;
+    height: number;
+}
+export interface UseAxisTooltipResult {
+    attachAxisTooltipListeners: (chart: {
+        on: (ev: string, fn: (...args: any[]) => void) => void;
+        off: (ev: string, fn: (...args: any[]) => void) => void;
+    }) => () => void;
+    renderAxisTooltipOverlay: () => React.ReactNode;
+}
+/**
+ * Axis tooltip as React Native UI: listens to ECharts `showTip` / `hideTip`, maps payload with
+ * {@link axisTooltipParamsFromShowTipEvent}, and positions an overlay near the pointer.
+ */
+export declare function useAxisTooltip(options: UseAxisTooltipOptions): UseAxisTooltipResult;
+//# sourceMappingURL=use-axis-tooltip.d.ts.map

package/cartesian/tooltip/use-axis-tooltip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-axis-tooltip.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/use-axis-tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGlF,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,KAAK,CAAC,SAAS,CAAC;CAC1D;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,uBAAuB,4BAY9F;AAED,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB,wGAAwG;IACxG,aAAa,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,KAAK,CAAC,SAAS,CAAC;IAC9D,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAChD,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,0BAA0B,EAAE,CAAC,KAAK,EAAE;QAClC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,KAAK,IAAI,CAAC;QACvD,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,KAAK,IAAI,CAAC;KACzD,KAAK,MAAM,IAAI,CAAC;IACjB,wBAAwB,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;CACjD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,oBAAoB,CA4CnF"}

package/cartesian/tooltip/use-axis-tooltip.js

@@ -0,0 +1,54 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { ChartPointerTooltipOverlay } from '../../tooltip/chart-pointer-tooltip-overlay';
+import { axisTooltipParamsFromShowTipEvent } from './axis-tooltip.utils';
+/** Presentational overlay; use with your own state if you do not use the hook. */
+export function AxisTooltipOverlay({ width, height, params, children }) {
+    if (params == null)
+        return null;
+    return (<ChartPointerTooltipOverlay width={width} height={height} pointerX={params.pointerX} pointerY={params.pointerY}>
+      {children(params)}
+    </ChartPointerTooltipOverlay>);
+}
+/**
+ * Axis tooltip as React Native UI: listens to ECharts `showTip` / `hideTip`, maps payload with
+ * {@link axisTooltipParamsFromShowTipEvent}, and positions an overlay near the pointer.
+ */
+export function useAxisTooltip(options) {
+    const { active, renderTooltip, contextRef, themeSeriesRef, width, height } = options;
+    const [tooltipParams, setTooltipParams] = useState(null);
+    useEffect(() => {
+        if (!active)
+            setTooltipParams(null);
+    }, [active]);
+    const attachAxisTooltipListeners = useCallback((chart) => {
+        if (!active)
+            return () => { };
+        const onShowTip = (evt) => {
+            const ctx = contextRef.current;
+            if (!ctx?.displaySeries?.length) {
+                setTooltipParams(null);
+                return;
+            }
+            const params = axisTooltipParamsFromShowTipEvent(evt, ctx, themeSeriesRef.current ?? []);
+            setTooltipParams(params);
+        };
+        const onHideTip = () => setTooltipParams(null);
+        chart.on('showTip', onShowTip);
+        chart.on('hideTip', onHideTip);
+        return () => {
+            chart.off('showTip', onShowTip);
+            chart.off('hideTip', onHideTip);
+        };
+    }, [active, contextRef, themeSeriesRef]);
+    const renderAxisTooltipOverlay = useCallback(() => {
+        if (!active || tooltipParams == null)
+            return null;
+        return (<AxisTooltipOverlay width={width} height={height} params={tooltipParams}>
+        {renderTooltip}
+      </AxisTooltipOverlay>);
+    }, [active, renderTooltip, tooltipParams, width, height]);
+    return {
+        attachAxisTooltipListeners,
+        renderAxisTooltipOverlay,
+    };
+}

package/column/column-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/column/column-chart.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,OAAO,KAAqC,MAAM,OAAO,CAAC;AAI1D,oCAAoC;AACpC,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA6jB7D,eAAO,MAAM,WAAW;;;;;;;CAEtB,CAAC"}
+{"version":3,"file":"column-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/column/column-chart.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,OAAO,KAAqC,MAAM,OAAO,CAAC;AAW1D,oCAAoC;AACpC,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAgpB7D,eAAO,MAAM,WAAW;;;;;;;CAEtB,CAAC"}

package/column/column-chart.js

@@ -5,7 +5,10 @@ import { BarChart as EChartsBarChart } from 'echarts/charts';
 import { GridComponent, LegendComponent, TooltipComponent, } from 'echarts/components';
 import * as echarts from 'echarts/core';
 import React, { useEffect, useMemo, useRef } from 'react';
-import { getAxis } from '../axis';
+import { View } from 'react-native';
+import { getAxis, valueAxisBoundsFromProps, xAxisBoundsFromProps } from '../axis';
+import { createAxisTooltipPreset, useAxisTooltip } from '../cartesian/tooltip';
+import { echartsLegendLayoutFragment, mergeCartesianGridForLegend, } from '../legend/echarts-legend-layout';
 echarts.use([
     TooltipComponent,
     GridComponent,
@@ -13,12 +16,44 @@ echarts.use([
     SkiaRenderer,
     EChartsBarChart,
 ]);
-const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, cornerRadius = [4, 4, 0, 0], horizontal = false, stack, stackNormalize = false, activeIndex, activeColor, barInsideLabelPosition = 'start', barInsideLabelFormatter, barOutsideLabelPosition = 'start', barOutsideLabelFormatter, itemStyle, showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, grid, showLegend = false, showHighlighter = true, xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisTicks, xAxisLabel, yAxisLabel, onSelect, ...props }) => {
+/** Stable identity for default `cornerRadius` (inline `[4,4,0,0]` in params is a new array every render). */
+const DEFAULT_COLUMN_CORNER_RADIUS = [4, 4, 0, 0];
+function columnCornerRadiusDep(value) {
+    if (typeof value === 'number')
+        return value;
+    if (Array.isArray(value))
+        return value.join(',');
+    return '4,4,0,0';
+}
+const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, cornerRadius = DEFAULT_COLUMN_CORNER_RADIUS, horizontal = false, stack, stackNormalize = false, activeIndex, activeColor, barInsideLabelPosition = 'start', barInsideLabelFormatter, barOutsideLabelPosition = 'start', barOutsideLabelFormatter, itemStyle, showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, grid, showLegend = true, legendPosition = 'bottom', showHighlighter = false, tooltip = 'card', xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisLabel, yAxisLabel, minX, maxX, intervalX, minY, maxY, intervalY, onSelect, renderTooltip, ...props }) => {
     const { theme } = useChartTheme(props.theme, props.colors);
     const chartRef = useRef(null);
     const onSelectRef = useRef(onSelect);
     onSelectRef.current = onSelect;
-    const selectContextRef = useRef({ displaySeries: [], labelOverlayDuplicate: false });
+    const selectContextRef = useRef({
+        displaySeries: [],
+        categoryAxisData: [],
+        labelOverlayDuplicate: false,
+        categoryAxisIsY: false,
+    });
+    const themeSeriesRef = useRef(theme.series);
+    themeSeriesRef.current = theme.series;
+    const tooltipOverlayActive = renderTooltip != null || tooltip !== 'none';
+    const renderTooltipFn = useMemo(() => {
+        if (renderTooltip != null)
+            return renderTooltip;
+        if (tooltip === 'none')
+            return () => null;
+        return createAxisTooltipPreset(tooltip);
+    }, [renderTooltip, tooltip]);
+    const { attachAxisTooltipListeners, renderAxisTooltipOverlay } = useAxisTooltip({
+        active: tooltipOverlayActive,
+        renderTooltip: renderTooltipFn,
+        contextRef: selectContextRef,
+        themeSeriesRef,
+        width,
+        height,
+    });
     const normalizedSeries = useMemo(() => {
         let normalizedData = [];
         if (!Array.isArray(data) || data.length === 0)
@@ -82,34 +117,31 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
             };
         });
     }, [normalizedSeries, stackNormalize]);
+    const valueAxisBounds = useMemo(() => valueAxisBoundsFromProps({ minY, maxY, intervalY }), [minY, maxY, intervalY]);
+    const xAxisBounds = useMemo(() => xAxisBoundsFromProps({ minX, maxX, intervalX }), [minX, maxX, intervalX]);
     const showLabelInside = barInsideLabelFormatter != null;
     const showLabelOutside = barOutsideLabelFormatter != null;
     const isSingleSeries = displaySeries.length === 1;
     const labelOverlayDuplicate = showLabelInside && showLabelOutside && isSingleSeries;
-    selectContextRef.current = { displaySeries, labelOverlayDuplicate };
-    const option = useMemo(() => {
+    const categoryAxisData = useMemo(() => {
         const categories = (displaySeries[0]?.data ?? []).map((item) => String(item[0]));
         const dataPoints = displaySeries.flatMap((s) => s.data.map((d) => d[1]));
-        const xAxisData = xAxisTicks != null && xAxisTicks.length > 0
-            ? xAxisTicks
-            : categories.length > 0
-                ? categories
-                : getAxis(dataPoints).map(String);
-        const tooltipConfig = showHighlighter
-            ? {
-                trigger: 'axis',
-                axisPointer: {
-                    type: 'shadow',
-                    shadowStyle: {
-                        color: 'rgba(0,0,0,0.08)',
-                    },
-                },
-            }
-            : { trigger: 'axis' };
+        return categories.length > 0 ? categories : getAxis(dataPoints).map(String);
+    }, [displaySeries]);
+    selectContextRef.current = {
+        displaySeries,
+        categoryAxisData,
+        labelOverlayDuplicate,
+        categoryAxisIsY: horizontal,
+    };
+    const option = useMemo(() => {
+        const categories = (displaySeries[0]?.data ?? []).map((item) => String(item[0]));
+        const xAxisData = categoryAxisData;
         const categoryAxisConfig = {
             type: 'category',
             data: xAxisData,
             boundaryGap,
+            ...(!horizontal ? (xAxisBounds ?? {}) : {}),
             ...((horizontal ? yAxisLabel : xAxisLabel) != null && (horizontal ? yAxisLabel : xAxisLabel) !== '' && {
                 name: horizontal ? yAxisLabel : xAxisLabel,
                 nameLocation: 'middle',
@@ -145,13 +177,15 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
                 },
             },
         };
+        const stackPct = stackNormalize && displaySeries.length > 1;
+        const valueAxisNumericExtras = stackPct
+            ? { min: 0, max: 100 }
+            : horizontal
+                ? { ...(valueAxisBounds ?? {}), ...(xAxisBounds ?? {}) }
+                : (valueAxisBounds ?? {});
         const valueAxisConfig = {
             type: 'value',
-            ...(stackNormalize &&
-                displaySeries.length > 1 && {
-                min: 0,
-                max: 100,
-            }),
+            ...valueAxisNumericExtras,
             ...((horizontal ? xAxisLabel : yAxisLabel) != null && (horizontal ? xAxisLabel : yAxisLabel) !== '' && {
                 name: horizontal ? xAxisLabel : yAxisLabel,
                 nameLocation: 'middle',
@@ -197,6 +231,7 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
                 data: normalizedSeries
                     .filter((s) => 'name' in s && s.name)
                     .map((s) => s.name),
+                ...echartsLegendLayoutFragment(legendPosition),
                 textStyle: {
                     color: theme.legend.textColor,
                     fontSize: theme.legend.fontSize,
@@ -368,22 +403,37 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
             seriesConfig.push(labelOnlySeries);
         }
         const config = {
-            tooltip: tooltipConfig,
             xAxis: xAxisConfig,
             yAxis: yAxisConfig,
             series: seriesConfig,
+            axisPointer: {
+                show: true,
+                type: 'line',
+                snap: true,
+                lineStyle: {
+                    type: 'solid',
+                    width: 1,
+                    color: '#00000000',
+                    show: false,
+                },
+                label: {
+                    show: false,
+                },
+            },
         };
         if (legendConfig)
             config.legend = legendConfig;
-        if (grid)
-            config.grid = grid;
+        const mergedGrid = mergeCartesianGridForLegend(grid, legendPosition, showLegend, hasNamedSeries);
+        if (mergedGrid !== undefined && Object.keys(mergedGrid).length > 0) {
+            config.grid = mergedGrid;
+        }
         return config;
     }, [
         theme,
         normalizedSeries,
         displaySeries,
         boundaryGap,
-        cornerRadius,
+        columnCornerRadiusDep(cornerRadius),
         horizontal,
         stack,
         stackNormalize,
@@ -402,20 +452,26 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
         showYAxisSplitLines,
         grid,
         showLegend,
+        legendPosition,
         hasNamedSeries,
         showHighlighter,
+        tooltipOverlayActive,
         xAxisTickLabelFormatter,
         yAxisTickLabelFormatter,
-        xAxisTicks,
         xAxisLabel,
         yAxisLabel,
+        categoryAxisData,
+        valueAxisBounds,
+        xAxisBounds,
     ]);
     useEffect(() => {
         let chart;
+        let detachAxisTooltip = () => { };
         if (chartRef.current) {
             try {
                 chart = echarts.init(chartRef.current, 'light', { width, height });
                 chart.setOption(option);
+                detachAxisTooltip = attachAxisTooltipListeners(chart);
                 const handleSeriesClick = (params) => {
                     const cb = onSelectRef.current;
                     if (typeof cb !== 'function')
@@ -463,6 +519,7 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
             }
         }
         return () => {
+            detachAxisTooltip();
             if (chart) {
                 try {
                     chart.dispose();
@@ -472,8 +529,11 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
                 }
             }
         };
-    }, [option, width, height]);
-    return <SkiaChart ref={chartRef} useRNGH/>;
+    }, [option, width, height, attachAxisTooltipListeners]);
+    return (<View style={{ width, height, position: 'relative' }}>
+      <SkiaChart ref={chartRef} useRNGH/>
+      {renderAxisTooltipOverlay()}
+    </View>);
 };
 const ColumnChartComponent = withResponsiveContainer(withChartTheme(ChartComponent));
 export const ColumnChart = Object.assign(ColumnChartComponent, {

package/geo/geo-chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geo-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/geo-chart.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAoC,MAAM,mBAAmB,CAAC;AAKzF,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAErG,2GAA2G;AAC3G,eAAO,MAAM,iBAAiB,kCAAyC,CAAC;AAuNxE,eAAO,MAAM,QAAQ;;;;;;;CAEnB,CAAC"}
+{"version":3,"file":"geo-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/geo-chart.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAoC,MAAM,mBAAmB,CAAC;AAOzF,OAAO,KAAgE,MAAM,OAAO,CAAC;AAGrF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAErG,2GAA2G;AAC3G,eAAO,MAAM,iBAAiB,kCAAyC,CAAC;AA0PxE,eAAO,MAAM,QAAQ;;;;;;;CAEnB,CAAC"}