@wavemaker/react-native-echarts 1.0.0-dev.5 → 1.0.0-dev.8

package/README.md

@@ -25,6 +25,13 @@ npm install @shopify/react-native-skia @wuba/react-native-echarts echarts zrende
 
 `react` and `react-native` are also peers; they should already be present in your app.
 
+**Note**:
+There is an issue with echarts library. Due to which compilation fails with an error. Here is the link to the issue.
+https://github.com/apache/echarts/pull/20485
+
+Till the issue is fixed, follow the workaround mentioned in the below link.
+https://github.com/wuba/react-native-echarts/issues/239#issuecomment-2899678660
+
 ## Chart gallery
 
 Preview thumbnails for the chart examples in `assets/images/charts`. Each image uses the same width and height (200×200) so the layout stays even; `object-fit: contain` keeps aspect ratios readable.
@@ -335,14 +342,33 @@ cd dist/npm-packages/charts && npm publish
 
 ## Development
 
-This repo is an Expo app. To run the app and Storybook:
+Work from the **repository root** (the directory that contains `package.json`, `components/`, and `stories/`).
+
+### Browser (Storybook)
+
+Storybook runs the chart stories in the browser with Vite. After install, it serves at **http://localhost:6006**.
+
+```bash
+npm install
+npm run storybook
+```
+
+### Mobile (Expo sample app)
+
+The **`expo-app/`** project is a small Expo Router app that consumes the library via **[yalc](https://github.com/wclr/yalc)**. Install **`yalc` globally** first so those commands are on your `PATH`.
 
 ```bash
+npm install -g yalc
+cd /path/to/repo # repository root directory
+npm install
+npm run generate:package
+cd expo-app
 npm install
-npx expo start # for mobile preview
-npm run storybook # to checout the component stories 
+npx expo start
 ```
 
+Whenever you change library source under `components/` or related entry points, run **`npm run generate:package`** again from the repo root so the yalc-linked package is rebuilt and republished. When changes are not reflecting in the app even after reload, use **`npx expo start -c`**.
+
 ---
 
 ## Maintainers

package/area/area-chart.d.ts

@@ -1,6 +1,6 @@
 import type { AreaChartProps } from './area-chart.props';
 import React from 'react';
-export type { AreaChartProps, AreaChartSelectEvent, SeriesData, } from './area-chart.props';
+export type { AreaChartProps, AreaChartSelectEvent, AreaChartAxisTooltipParams, AreaChartTooltipSeriesItem, SeriesData, } from './area-chart.props';
 export declare const AreaChart: ((props: AreaChartProps & {
     theme?: Partial<import("..").ChartTheme>;
 } & {

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

@@ -1 +1 @@
-{"version":3,"file":"area-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/area-chart.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,oBAAoB,CAAC;AASrE,OAAO,KAAqC,MAAM,OAAO,CAAC;AAI1D,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,MAAM,oBAAoB,CAAC;AAsc5B,eAAO,MAAM,SAAS;;;;;;;CAEpB,CAAC"}
+{"version":3,"file":"area-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/area-chart.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAWzD,OAAO,KAAqC,MAAM,OAAO,CAAC;AAK1D,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,EAC1B,UAAU,GACX,MAAM,oBAAoB,CAAC;AA+d5B,eAAO,MAAM,SAAS;;;;;;;CAEpB,CAAC"}

package/area/area-chart.js

@@ -1,10 +1,12 @@
 import { withResponsiveContainer } from '../chart-container';
 import { useChartTheme, withChartTheme } from '../chart-theme.context';
+import { createAxisTooltipPreset, useAxisTooltip } from '../cartesian/tooltip';
 import { SkiaChart, SkiaRenderer } from '@wuba/react-native-echarts';
 import { LineChart } from 'echarts/charts';
 import { GridComponent, LegendComponent, TooltipComponent } from 'echarts/components';
 import * as echarts from 'echarts/core';
 import React, { useEffect, useMemo, useRef } from 'react';
+import { View } from 'react-native';
 import { getAxis } from '../axis';
 // Register necessary components for this chart
 echarts.use([
@@ -14,14 +16,32 @@ echarts.use([
     SkiaRenderer,
     LineChart,
 ]);
-const ChartComponent = ({ data, width = 220, height = 350, type = 'default', step, boundaryGap = false, stack, stackNormalize = false, symbol, symbolSize, areaOpacity = 0.6, areaFill = 'gradient', showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, grid, showLegend = false, showHighlighter = true, xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisTicks, xAxisLabel, yAxisLabel, onSelect, ...props }) => {
+const ChartComponent = ({ data, width = 220, height = 350, type = 'default', step, boundaryGap = false, stack, stackNormalize = false, symbol, symbolSize, areaOpacity = 0.6, areaFill = 'gradient', showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, grid, showLegend = false, showHighlighter = true, tooltip = 'card', xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisTicks, xAxisLabel, yAxisLabel, onSelect, renderTooltip, ...props }) => {
     const { theme } = useChartTheme(props.theme, props.colors);
     const chartRef = useRef(null);
     const onSelectRef = useRef(onSelect);
     onSelectRef.current = onSelect;
-    const selectContextRef = useRef({
+    const axisTooltipContextRef = useRef({
         displaySeries: [],
-        xAxisData: [],
+        categoryAxisData: [],
+    });
+    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: axisTooltipContextRef,
+        themeSeriesRef,
+        width,
+        height,
     });
     // Derive smooth/step from type
     const effectiveSmooth = type === 'smooth';
@@ -93,23 +113,8 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
             ? xAxisTicks
             : getAxis(dataPoints).map(String);
     }, [normalizedSeries, xAxisTicks]);
-    selectContextRef.current = { displaySeries, xAxisData };
+    axisTooltipContextRef.current = { displaySeries, categoryAxisData: xAxisData };
     const option = useMemo(() => {
-        // Build tooltip config
-        // axisPointer with snap: true so the pointer snaps to data points and triggers
-        // series emphasis (circle) at the hovered position. See https://echarts.apache.org/en/option.html#tooltip.axisPointer
-        const tooltipConfig = showHighlighter ? {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'line',
-                snap: true,
-                lineStyle: {
-                    type: 'solid',
-                    width: 1,
-                    color: theme.series[0].color ?? '#999',
-                },
-            },
-        } : null;
         // Build xAxis config (category with data indices)
         const xAxisConfig = {
             type: 'category',
@@ -280,10 +285,23 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
             return series;
         });
         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,
+                }
+            }
         };
         // Add legend if configured
         if (legendConfigFinal) {
@@ -319,6 +337,7 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
         showLegend,
         hasNamedSeries,
         showHighlighter,
+        tooltipOverlayActive,
         xAxisTickLabelFormatter,
         yAxisTickLabelFormatter,
         xAxisTicks,
@@ -327,6 +346,7 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
     ]);
     useEffect(() => {
         let chart;
+        let detachAxisTooltip = () => { };
         if (chartRef.current) {
             try {
                 chart = echarts.init(chartRef.current, 'light', {
@@ -334,6 +354,7 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
                     height: height,
                 });
                 chart.setOption(option);
+                detachAxisTooltip = attachAxisTooltipListeners(chart);
                 const handleSeriesClick = (params) => {
                     const cb = onSelectRef.current;
                     if (typeof cb !== 'function')
@@ -347,7 +368,7 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
                         dataIndex < 0) {
                         return;
                     }
-                    const { displaySeries: ds, xAxisData: xd } = selectContextRef.current;
+                    const { displaySeries: ds, categoryAxisData: xd } = axisTooltipContextRef.current;
                     const s = ds[seriesIndex];
                     if (!s?.data || !Array.isArray(s.data))
                         return;
@@ -386,6 +407,7 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
             }
         }
         return () => {
+            detachAxisTooltip();
             if (chart) {
                 try {
                     chart.dispose();
@@ -395,8 +417,11 @@ const ChartComponent = ({ data, width = 220, height = 350, type = 'default', ste
                 }
             }
         };
-    }, [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 AreaChartComponent = withResponsiveContainer(withChartTheme(ChartComponent));
 export const AreaChart = Object.assign(AreaChartComponent, {

package/area/area-chart.props.d.ts

@@ -1,4 +1,7 @@
 import type { CartesianChartProps, CartesianChartSelectEvent } from '../props/cartesian';
+import type { ChartTooltipOption } from '../tooltip';
+/** @deprecated Use {@link ChartTooltipOption} from `../tooltip`. */
+export type AreaChartTooltip = ChartTooltipOption;
 /**
  * Area/line/bar series data shape:
  * - Single series: number[]
@@ -14,6 +17,7 @@ export type SeriesData = number[] | [string | number, number][] | Array<{
 }>;
 /** @deprecated Use {@link CartesianChartSelectEvent} from `../props/cartesian`. */
 export type AreaChartSelectEvent = CartesianChartSelectEvent;
+export type { AxisTooltipParams as AreaChartAxisTooltipParams, AxisTooltipSeriesItem as AreaChartTooltipSeriesItem, } from '../cartesian/tooltip/axis-tooltip.types';
 /**
  * Props for AreaChart.
  * common -> cartesian -> area

package/area/area-chart.props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"area-chart.props.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/area-chart.props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAEzF;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAClB,MAAM,EAAE,GACR,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,GAC3B,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GACxC,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC,CAAC;AAEhE,mFAAmF;AACnF,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,mBAAmB;IACzD;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;IAC1C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;IACtG;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACzE;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,OAAO,CAAC;CACjD"}
+{"version":3,"file":"area-chart.props.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/area-chart.props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,oEAAoE;AACpE,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAClB,MAAM,EAAE,GACR,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,GAC3B,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GACxC,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC,CAAC;AAEhE,mFAAmF;AACnF,MAAM,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE7D,YAAY,EACV,iBAAiB,IAAI,0BAA0B,EAC/C,qBAAqB,IAAI,0BAA0B,GACpD,MAAM,yCAAyC,CAAC;AAEjD;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,mBAAmB;IACzD;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;IAC1C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;IACtG;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACzE;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,OAAO,CAAC;CACjD"}

package/area/index.d.ts

@@ -1,3 +1,3 @@
 export { AreaChart } from './area-chart';
-export type { AreaChartProps, AreaChartSelectEvent, SeriesData, } from './area-chart.props';
+export type { AreaChartProps, AreaChartSelectEvent, AreaChartAxisTooltipParams, AreaChartTooltip, AreaChartTooltipSeriesItem, SeriesData, } from './area-chart.props';
 //# sourceMappingURL=index.d.ts.map

package/area/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/chart/area/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,YAAY,EACV,cAAc,EACd,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,EAChB,0BAA0B,EAC1B,UAAU,GACX,MAAM,oBAAoB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"bubble-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/bubble/bubble-chart.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,OAAO,KAAqC,MAAM,OAAO,CAAC;AAG1D,+CAA+C;AAC/C,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAkV/E,eAAO,MAAM,WAAW;;;;;;;CAEtB,CAAC"}
+{"version":3,"file":"bubble-chart.d.ts","sourceRoot":"","sources":["../../../../components/chart/bubble/bubble-chart.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,OAAO,KAAqC,MAAM,OAAO,CAAC;AAO1D,+CAA+C;AAC/C,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAyW/E,eAAO,MAAM,WAAW;;;;;;;CAEtB,CAAC"}

package/bubble/bubble-chart.js

@@ -5,6 +5,9 @@ import { ScatterChart as EChartsScatterChart } from 'echarts/charts';
 import { GridComponent, LegendComponent, TooltipComponent, } from 'echarts/components';
 import * as echarts from 'echarts/core';
 import React, { useEffect, useMemo, useRef } from 'react';
+import { View } from 'react-native';
+import { axisTooltipShowContentFlag } from '../cartesian/tooltip';
+import { createScatterTooltipPreset, useScatterItemTooltip } from '../scatter/tooltip';
 echarts.use([
     TooltipComponent,
     GridComponent,
@@ -18,12 +21,31 @@ function scaleSize(value, dataMin, dataMax, outMin, outMax) {
     const t = (value - dataMin) / (dataMax - dataMin);
     return outMin + t * (outMax - outMin);
 }
-const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', sizeRange = [8, 50], showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, boundaryGap = false, grid, showLegend = false, showHighlighter = true, xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisLabel, yAxisLabel, onSelect, ...props }) => {
+const DEFAULT_SIZE_RANGE = [8, 50];
+const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', sizeRange = DEFAULT_SIZE_RANGE, showXAxis = true, showXAxisTicks = true, showYAxis = true, showYAxisTicks = true, showXAxisSplitLines = true, showYAxisSplitLines = true, boundaryGap = false, grid, showLegend = false, showHighlighter = true, tooltip = 'card', xAxisTickLabelFormatter, yAxisTickLabelFormatter, xAxisLabel, yAxisLabel, onSelect, renderTooltip, ...props }) => {
     const { theme } = useChartTheme(props.theme, props.colors);
     const chartRef = useRef(null);
     const onSelectRef = useRef(onSelect);
     onSelectRef.current = onSelect;
     const selectContextRef = useRef({ normalizedSeries: [] });
+    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 createScatterTooltipPreset(tooltip);
+    }, [renderTooltip, tooltip]);
+    const { attachScatterItemTooltipListeners, renderScatterTooltipOverlay } = useScatterItemTooltip({
+        active: tooltipOverlayActive,
+        renderTooltip: renderTooltipFn,
+        contextRef: selectContextRef,
+        themeSeriesRef,
+        width,
+        height,
+    });
     const normalizedSeries = useMemo(() => {
         if (!Array.isArray(data) || data.length === 0)
             return [];
@@ -52,39 +74,29 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
         return [];
     }, [data]);
     const hasNamedSeries = useMemo(() => normalizedSeries.some((s) => 'name' in s && s.name), [normalizedSeries]);
-    selectContextRef.current = { normalizedSeries };
+    selectContextRef.current = {
+        normalizedSeries: normalizedSeries,
+    };
     const option = useMemo(() => {
-        const tooltipConfig = showHighlighter
+        const tooltipConfig = tooltipOverlayActive
             ? {
                 trigger: 'item',
-                axisPointer: {
-                    type: 'cross',
-                    lineStyle: {
+                ...axisTooltipShowContentFlag(true),
+                ...(showHighlighter && {
+                    axisPointer: {
                         type: 'line',
-                        width: 1,
-                        color: theme.series[0]?.color ?? '#999',
+                        lineStyle: {
+                            type: 'line',
+                            width: 1,
+                            color: '#00000000',
+                        },
+                        label: {
+                            show: false,
+                        },
                     },
-                },
-                formatter: (params) => {
-                    const p = Array.isArray(params) ? params[0] : params;
-                    const d = p?.data;
-                    if (!d || !Array.isArray(d))
-                        return '';
-                    const name = p.seriesName ? `${p.seriesName}<br/>` : '';
-                    return `${name}x: ${d[0]}, y: ${d[1]}${d[2] != null ? `, size: ${d[2]}` : ''}`;
-                },
+                }),
             }
-            : {
-                trigger: 'item',
-                formatter: (params) => {
-                    const p = Array.isArray(params) ? params[0] : params;
-                    const d = p?.data;
-                    if (!d || !Array.isArray(d))
-                        return '';
-                    const name = p.seriesName ? `${p.seriesName}<br/>` : '';
-                    return `${name}x: ${d[0]}, y: ${d[1]}${d[2] != null ? `, size: ${d[2]}` : ''}`;
-                },
-            };
+            : { show: false };
         const xAxisConfig = {
             type: 'value',
             boundaryGap,
@@ -193,7 +205,7 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
                 itemStyle: { color: seriesColor },
                 emphasis: showHighlighter
                     ? {
-                        focus: 'self',
+                        focus: 'none',
                         scale: true,
                         itemStyle: {
                             color: seriesColor,
@@ -234,6 +246,7 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
         showLegend,
         hasNamedSeries,
         showHighlighter,
+        tooltipOverlayActive,
         xAxisTickLabelFormatter,
         yAxisTickLabelFormatter,
         xAxisLabel,
@@ -241,10 +254,12 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
     ]);
     useEffect(() => {
         let chart;
+        let detachScatterTooltip = () => { };
         if (chartRef.current) {
             try {
                 chart = echarts.init(chartRef.current, 'light', { width, height });
                 chart.setOption(option);
+                detachScatterTooltip = attachScatterItemTooltipListeners(chart);
                 const handleSeriesClick = (params) => {
                     const cb = onSelectRef.current;
                     if (typeof cb !== 'function')
@@ -287,6 +302,7 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
             }
         }
         return () => {
+            detachScatterTooltip();
             if (chart) {
                 try {
                     chart.dispose();
@@ -296,8 +312,11 @@ const ChartComponent = ({ data, width = 220, height = 350, symbol = 'circle', si
                 }
             }
         };
-    }, [option, width, height]);
-    return <SkiaChart ref={chartRef} useRNGH/>;
+    }, [option, width, height, attachScatterItemTooltipListeners]);
+    return (<View style={{ width, height, position: 'relative' }}>
+      <SkiaChart ref={chartRef} useRNGH/>
+      {renderScatterTooltipOverlay()}
+    </View>);
 };
 const BubbleChartComponent = withResponsiveContainer(withChartTheme(ChartComponent));
 export const BubbleChart = Object.assign(BubbleChartComponent, {

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

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { ChartTooltipPreset } from '../../tooltip';
+import type { AxisTooltipParams } from './axis-tooltip.types';
+export declare function createAxisTooltipPreset(preset: ChartTooltipPreset): (params: AxisTooltipParams) => React.ReactElement;
+//# sourceMappingURL=axis-tooltip-presets.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"axis-tooltip-presets.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/axis-tooltip-presets.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA0D9D,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,kBAAkB,GACzB,CAAC,MAAM,EAAE,iBAAiB,KAAK,KAAK,CAAC,YAAY,CAYnD"}

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

@@ -0,0 +1,46 @@
+import React from 'react';
+import { TooltipPresetCard, TooltipPresetCompact, TooltipPresetKpi, TooltipPresetStriped, } from '../../tooltip/chart-tooltip-preset-shells';
+function axisCardFromParams({ axisValue, series }) {
+    return (<TooltipPresetCard categoryTitle={String(axisValue)} seriesRows={series.map((s) => ({
+            key: s.seriesIndex,
+            swatchColor: s.color ?? '#94a3b8',
+            label: s.seriesName,
+            value: s.value,
+        }))}/>);
+}
+function axisCompactFromParams({ axisValue, series }) {
+    const detail = series.map((s) => `${s.seriesName} ${s.value}`).join(' · ');
+    return <TooltipPresetCompact emphasis={String(axisValue)} detail={detail} wrap/>;
+}
+function axisKpiFromParams({ axisValue, series }) {
+    const primary = series[0];
+    const rest = series.slice(1);
+    return (<TooltipPresetKpi accentColor={primary?.color ?? '#3b82f6'} minWidth={160} overline={String(axisValue)} metric={primary?.value ?? ''} caption={primary?.seriesName} footerRows={rest.length > 0
+            ? rest.map((s) => ({
+                key: s.seriesIndex,
+                left: s.seriesName,
+                right: s.value,
+            }))
+            : undefined}/>);
+}
+function axisStripedFromParams({ axisValue, series }) {
+    return (<TooltipPresetStriped headerTitle={String(axisValue)} rows={series.map((s) => ({
+            key: `s-${s.seriesIndex}`,
+            leftLabel: s.seriesName,
+            leftSwatchColor: s.color ?? '#64748b',
+            right: s.value,
+        }))}/>);
+}
+export function createAxisTooltipPreset(preset) {
+    switch (preset) {
+        case 'card':
+            return (p) => axisCardFromParams(p);
+        case 'compact':
+            return (p) => axisCompactFromParams(p);
+        case 'kpi':
+            return (p) => axisKpiFromParams(p);
+        case 'striped':
+            return (p) => axisStripedFromParams(p);
+    }
+    throw new Error(`Unknown tooltip preset: ${String(preset)}`);
+}

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

@@ -0,0 +1,38 @@
+/**
+ * Types for axis-triggered tooltips (category axis + one value per series).
+ * Used by area, line, column, and bar charts.
+ */
+/** One series row at the hovered category index. */
+export interface AxisTooltipSeriesItem {
+    seriesName: string;
+    value: number;
+    seriesIndex: number;
+    color?: string;
+}
+/** Axis tooltip fields without pointer position. */
+export interface AxisTooltipContentParams {
+    axisValue: string | number;
+    dataIndex: number;
+    series: AxisTooltipSeriesItem[];
+}
+/** Payload for `renderTooltip` (includes pointer in chart pixel space). */
+export interface AxisTooltipParams extends AxisTooltipContentParams {
+    pointerX: number;
+    pointerY: number;
+}
+/**
+ * Ref snapshot read when `showTip` fires. Keep `categoryAxisData` in sync with the chart’s category axis `data`.
+ */
+export interface AxisTooltipContext {
+    displaySeries: Array<{
+        name?: string;
+        data: [string | number, number][] | number[];
+    }>;
+    categoryAxisData: (string | number)[];
+    /**
+     * Set when the category axis is Y (horizontal column/bar). `showTip` lists that axis in `dataByAxis`;
+     * reading `[0]` would be the value axis and yields a stuck `dataIndex`.
+     */
+    categoryAxisIsY?: boolean;
+}
+//# sourceMappingURL=axis-tooltip.types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"axis-tooltip.types.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/axis-tooltip.types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oDAAoD;AACpD,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,oDAAoD;AACpD,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC;AAED,2EAA2E;AAC3E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACtF,gBAAgB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACtC;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}

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

@@ -0,0 +1,4 @@
+/**
+ * Types for axis-triggered tooltips (category axis + one value per series).
+ * Used by area, line, column, and bar charts.
+ */

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

@@ -0,0 +1,10 @@
+import type { AxisTooltipContext, AxisTooltipParams } from './axis-tooltip.types';
+/** Build axis tooltip params from an ECharts `showTip` dispatch payload. */
+export declare function axisTooltipParamsFromShowTipEvent(evt: any, ctx: AxisTooltipContext, seriesTheme: Array<{
+    color: string;
+}>): AxisTooltipParams | null;
+/** Spread onto ECharts `tooltip` when using an RN overlay (`showTip` / `hideTip` still fire). */
+export declare function axisTooltipShowContentFlag(useCustomTooltipOverlay: boolean): {
+    showContent: boolean;
+};
+//# sourceMappingURL=axis-tooltip.utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"axis-tooltip.utils.d.ts","sourceRoot":"","sources":["../../../../../components/chart/cartesian/tooltip/axis-tooltip.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAyB,MAAM,sBAAsB,CAAC;AAsEzG,4EAA4E;AAC5E,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EACvB,WAAW,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,GACpC,iBAAiB,GAAG,IAAI,CAsD1B;AAED,iGAAiG;AACjG,wBAAgB,0BAA0B,CACxC,uBAAuB,EAAE,OAAO,GAC/B;IAAE,WAAW,EAAE,OAAO,CAAA;CAAE,CAE1B"}

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 };
+}