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

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;AAO1D,oCAAoC;AACpC,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAqnB7D,eAAO,MAAM,WAAW;;;;;;;CAEtB,CAAC"}

package/column/column-chart.js

@@ -5,7 +5,9 @@ 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 { View } from 'react-native';
 import { getAxis } from '../axis';
+import { createAxisTooltipPreset, useAxisTooltip } from '../cartesian/tooltip';
 echarts.use([
     TooltipComponent,
     GridComponent,
@@ -13,12 +15,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 = false, showHighlighter = false, 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({ 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)
@@ -86,26 +120,24 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
     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
+        return 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' };
+    }, [displaySeries, xAxisTicks]);
+    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,
@@ -368,10 +400,23 @@ 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;
@@ -383,7 +428,7 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
         normalizedSeries,
         displaySeries,
         boundaryGap,
-        cornerRadius,
+        columnCornerRadiusDep(cornerRadius),
         horizontal,
         stack,
         stackNormalize,
@@ -404,18 +449,22 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
         showLegend,
         hasNamedSeries,
         showHighlighter,
+        tooltipOverlayActive,
         xAxisTickLabelFormatter,
         yAxisTickLabelFormatter,
         xAxisTicks,
         xAxisLabel,
         yAxisLabel,
+        categoryAxisData,
     ]);
     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 +512,7 @@ const ChartComponent = ({ data, width = 220, height = 350, boundaryGap = true, c
             }
         }
         return () => {
+            detachAxisTooltip();
             if (chart) {
                 try {
                     chart.dispose();
@@ -472,8 +522,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"}

package/geo/geo-chart.js

@@ -1,11 +1,14 @@
 import { withResponsiveContainer } from '../chart-container';
 import { useChartTheme, withChartTheme } from '../chart-theme.context';
+import { axisTooltipShowContentFlag } from '../cartesian/tooltip';
+import { createGeoTooltipPreset, useGeoItemTooltip } from './tooltip';
 import { SkiaChart, SkiaRenderer } from '@wuba/react-native-echarts';
 import { MapChart } from 'echarts/charts';
 import { TooltipComponent, VisualMapComponent } from 'echarts/components';
 import * as echarts from 'echarts/core';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
-import worldJson from '../../../data/world.json';
+import { View } from 'react-native';
+import worldJson from './world.json';
 /** Optional context to provide mapJson without passing as prop (avoids Storybook serialization issues). */
 export const GeoMapJsonContext = createContext(null);
 echarts.use([
@@ -15,13 +18,41 @@ echarts.use([
     MapChart,
 ]);
 const DEFAULT_MAP_NAME = 'world';
-const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME, width = 400, height = 300, showLegend = true, showHighlighter = true, tooltipFormatter, visualMapMin, visualMapMax, visualMapMode = 'continuous', piecewisePieces, onSelect, ...props }) => {
+const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME, width = 400, height = 300, showLegend = true, showHighlighter = true, tooltip = 'card', renderTooltip, visualMapMin, visualMapMax, visualMapMode = 'continuous', piecewisePieces, onSelect, ...props }) => {
     const { theme } = useChartTheme(props.theme, props.colors);
     const chartRef = useRef(null);
     const onSelectRef = useRef(onSelect);
     onSelectRef.current = onSelect;
+    const geoContextRef = useRef({ regions: [] });
+    const themeSeriesRef = useRef(theme.series);
+    themeSeriesRef.current = theme.series;
     const contextMapJson = useContext(GeoMapJsonContext);
     const mapJson = mapJsonProp ?? contextMapJson ?? worldJson;
+    const tooltipOverlayActive = renderTooltip != null || tooltip !== 'none';
+    const renderTooltipFn = useMemo(() => {
+        if (renderTooltip != null)
+            return renderTooltip;
+        if (tooltip === 'none')
+            return () => null;
+        return createGeoTooltipPreset(tooltip);
+    }, [renderTooltip, tooltip]);
+    const { attachGeoItemTooltipListeners, renderGeoTooltipOverlay } = useGeoItemTooltip({
+        active: tooltipOverlayActive,
+        renderTooltip: renderTooltipFn,
+        contextRef: geoContextRef,
+        themeSeriesRef,
+        width,
+        height,
+    });
+    const tooltipRegions = useMemo(() => {
+        if (!Array.isArray(data) || data.length === 0)
+            return [];
+        return data.map((d) => ({
+            name: String(d.name),
+            value: Number(d.value),
+        }));
+    }, [data]);
+    geoContextRef.current = { regions: tooltipRegions };
     useEffect(() => {
         if (mapJson?.type === 'FeatureCollection' && mapJson.features?.length) {
             try {
@@ -47,20 +78,12 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
             return { series: [{ type: 'map', map: mapName, data: [] }] };
         }
         const seriesColor = theme.series[0]?.color ?? '#3b82f6';
-        const tooltipConfig = {
-            trigger: 'item',
-            formatter: tooltipFormatter
-                ? (params) => {
-                    const p = params?.data ?? params;
-                    return tooltipFormatter({ name: p?.name ?? '', value: p?.value ?? 0 });
-                }
-                : undefined,
-            backgroundColor: theme.tooltip.backgroundColor,
-            borderColor: theme.tooltip.borderColor,
-            borderWidth: theme.tooltip.borderWidth,
-            borderRadius: theme.tooltip.borderRadius,
-            padding: theme.tooltip.padding,
-        };
+        const tooltipConfig = tooltipOverlayActive
+            ? {
+                trigger: 'item',
+                ...axisTooltipShowContentFlag(true),
+            }
+            : { show: false };
         const visualMapConfig = showLegend
             ? visualMapMode === 'piecewise' && piecewisePieces?.length
                 ? {
@@ -112,15 +135,18 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
             },
             emphasis: showHighlighter
                 ? {
+                    focus: 'none',
                     itemStyle: {
-                        areaColor: seriesColor,
                         borderColor: '#333',
                         borderWidth: 1,
                     },
-                    label: {
-                        show: true,
-                        color: theme.legend.textColor,
-                    },
+                    // Avoid duplicating the region name when the RN tooltip is active.
+                    label: tooltipOverlayActive
+                        ? { show: false }
+                        : {
+                            show: true,
+                            color: theme.legend.textColor,
+                        },
                 }
                 : { disabled: true },
         };
@@ -138,12 +164,13 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
         valueRange,
         showLegend,
         showHighlighter,
-        tooltipFormatter,
+        tooltipOverlayActive,
         visualMapMode,
         piecewisePieces,
     ]);
     useEffect(() => {
         let chart;
+        let detachGeoTooltip = () => { };
         if (chartRef.current) {
             try {
                 chart = echarts.init(chartRef.current, 'light', {
@@ -151,6 +178,7 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
                     height,
                 });
                 chart.setOption(option);
+                detachGeoTooltip = attachGeoItemTooltipListeners(chart);
                 const handleMapClick = (params) => {
                     const cb = onSelectRef.current;
                     if (typeof cb !== 'function')
@@ -182,6 +210,7 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
             }
         }
         return () => {
+            detachGeoTooltip();
             if (chart) {
                 try {
                     chart.dispose();
@@ -191,8 +220,11 @@ const ChartComponent = ({ data, mapJson: mapJsonProp, mapName = DEFAULT_MAP_NAME
                 }
             }
         };
-    }, [option, width, height]);
-    return <SkiaChart ref={chartRef} useRNGH/>;
+    }, [option, width, height, attachGeoItemTooltipListeners]);
+    return (<View style={{ width, height, position: 'relative' }}>
+      <SkiaChart ref={chartRef} useRNGH/>
+      {renderGeoTooltipOverlay()}
+    </View>);
 };
 const GeoChartComponent = withResponsiveContainer(withChartTheme(ChartComponent));
 export const GeoChart = Object.assign(GeoChartComponent, {

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

@@ -1,4 +1,7 @@
 import type { CommonChartProps } from '../props/common';
+import type { ChartTooltipOption } from '../tooltip';
+import type { GeoItemTooltipParams } from './tooltip/geo-item-tooltip.types';
+import type { ReactNode } from 'react';
 /** Emitted when the user taps/clicks a map region. */
 export interface GeoChartSelectEvent {
     name: string;
@@ -59,12 +62,15 @@ export interface GeoChartProps extends CommonChartProps {
      */
     showHighlighter?: boolean;
     /**
-     * Formatter for tooltip. (params) => string. Params include name, value.
+     * Built-in region tooltip preset when `renderTooltip` is omitted. Use `none` to hide the overlay.
+     * @default 'card'
      */
-    tooltipFormatter?: (params: {
-        name: string;
-        value: number;
-    }) => string;
+    tooltip?: ChartTooltipOption;
+    /**
+     * Overrides the default React Native item tooltip body (see {@link GeoItemTooltipParams}).
+     * Takes precedence over {@link tooltip}.
+     */
+    renderTooltip?: (params: GeoItemTooltipParams) => ReactNode;
     /**
      * Minimum value for the visual map scale. Auto-derived from data if not set.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"geo-chart.props.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/geo-chart.props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,OAAO,CAAA;SAAE,CAAC;QACjD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD;;;OAGG;IACH,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IACvE;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IAC3C;;;OAGG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACjD"}
+{"version":3,"file":"geo-chart.props.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/geo-chart.props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,sDAAsD;AACtD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,OAAO,CAAA;SAAE,CAAC;QACjD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD;;;OAGG;IACH,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,SAAS,CAAC;IAC5D;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,aAAa,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IAC3C;;;OAGG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;CACjD"}

package/geo/index.d.ts

@@ -2,6 +2,7 @@ export { GeoChart, GeoMapJsonContext } from './geo-chart';
 export { USChart } from './us-chart';
 export { WorldChart } from './world-chart';
 export type { GeoChartProps, GeoChartSelectEvent, GeoDataItem, GeoJSONMap, } from './geo-chart.props';
+export * from './tooltip';
 export type { USChartProps } from './us-chart';
 export type { WorldChartProps } from './world-chart';
 //# sourceMappingURL=index.d.ts.map

package/geo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,YAAY,EACV,aAAa,EACb,mBAAmB,EACnB,WAAW,EACX,UAAU,GACX,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/chart/geo/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,YAAY,EACV,aAAa,EACb,mBAAmB,EACnB,WAAW,EACX,UAAU,GACX,MAAM,mBAAmB,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC"}

package/geo/index.js

@@ -1,3 +1,4 @@
 export { GeoChart, GeoMapJsonContext } from './geo-chart';
 export { USChart } from './us-chart';
 export { WorldChart } from './world-chart';
+export * from './tooltip';

package/geo/tooltip/default-geo-tooltip.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { ChartTheme } from '../../chart-theme.context';
+import type { GeoItemTooltipParams } from './geo-item-tooltip.types';
+/** Themed default geo / map item tooltip (React Native). */
+export declare function createDefaultGeoTooltip(theme: Pick<ChartTheme, 'tooltip'>): (params: GeoItemTooltipParams) => React.ReactElement;
+//# sourceMappingURL=default-geo-tooltip.d.ts.map

package/geo/tooltip/default-geo-tooltip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-geo-tooltip.d.ts","sourceRoot":"","sources":["../../../../../components/chart/geo/tooltip/default-geo-tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,4DAA4D;AAC5D,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GACjC,CAAC,MAAM,EAAE,oBAAoB,KAAK,KAAK,CAAC,YAAY,CA6BtD"}

package/geo/tooltip/default-geo-tooltip.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+/** Themed default geo / map item tooltip (React Native). */
+export function createDefaultGeoTooltip(theme) {
+    const t = theme.tooltip;
+    return function DefaultGeoTooltip(params) {
+        const { name, value, color } = params;
+        return (<View style={{
+                backgroundColor: t.backgroundColor,
+                borderColor: t.borderColor,
+                borderWidth: t.borderWidth,
+                borderRadius: t.borderRadius,
+                padding: t.padding,
+            }}>
+        <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 4 }}>
+          {color != null && color !== '' ? (<View style={[styles.swatch, { backgroundColor: color }]}/>) : (<View style={styles.swatchPlaceholder}/>)}
+          <Text style={[styles.title, { color: t.labelColor }]}>{name}</Text>
+        </View>
+        <Text style={[styles.line, { color: t.valueColor }]}>
+          <Text style={{ color: t.labelColor }}>value: </Text>
+          {String(value)}
+        </Text>
+      </View>);
+    };
+}
+const styles = StyleSheet.create({
+    title: {
+        fontWeight: '600',
+        fontSize: 13,
+        flex: 1,
+    },
+    line: {
+        fontSize: 12,
+        marginTop: 2,
+    },
+    swatch: {
+        width: 8,
+        height: 8,
+        borderRadius: 4,
+        marginRight: 6,
+    },
+    swatchPlaceholder: {
+        width: 8,
+        height: 8,
+        marginRight: 6,
+    },
+});