The Open Standard for Generative UI
hide tooltip if user touches outside (#177)
abhithesyscdbd264a8fc0
diff --git a/js/packages/react-ui/src/components/Charts/AreaChart/AreaChart.tsx b/js/packages/react-ui/src/components/Charts/AreaChart/AreaChart.tsxindex 3d80733a1..5730196a1 100644--- a/js/packages/react-ui/src/components/Charts/AreaChart/AreaChart.tsx+++ b/js/packages/react-ui/src/components/Charts/AreaChart/AreaChart.tsx@@ -345,7 +345,10 @@ const AreaChartComponent = <T extends AreaChartData>({}}/>- <ChartTooltip content={<CustomTooltipContent />} offset={15} />+ <ChartTooltip+ content={<CustomTooltipContent parentRef={mainContainerRef} />}+ offset={15}+ />{dataKeys.map((key) => {const transformedKey = transformedKeys[key];diff --git a/js/packages/react-ui/src/components/Charts/BarChart/BarChart.tsx b/js/packages/react-ui/src/components/Charts/BarChart/BarChart.tsxindex f0083c490..e65a54668 100644--- a/js/packages/react-ui/src/components/Charts/BarChart/BarChart.tsx+++ b/js/packages/react-ui/src/components/Charts/BarChart/BarChart.tsx@@ -471,7 +471,7 @@ const BarChartComponent = <T extends BarChartData>({opacity: 1,strokeWidth: 1,}}- content={<CustomTooltipContent />}+ content={<CustomTooltipContent parentRef={mainContainerRef} />}offset={15}/>diff --git a/js/packages/react-ui/src/components/Charts/HorizontalBarChart/HorizontalBarChart.tsx b/js/packages/react-ui/src/components/Charts/HorizontalBarChart/HorizontalBarChart.tsxindex e2c086b54..8b4ab2365 100644--- a/js/packages/react-ui/src/components/Charts/HorizontalBarChart/HorizontalBarChart.tsx+++ b/js/packages/react-ui/src/components/Charts/HorizontalBarChart/HorizontalBarChart.tsx@@ -396,7 +396,7 @@ const HorizontalBarChartComponent = <T extends HorizontalBarChartData>({opacity: 1,strokeWidth: 1,}}- content={<CustomTooltipContent />}+ content={<CustomTooltipContent parentRef={mainContainerRef} />}offset={15}/>diff --git a/js/packages/react-ui/src/components/Charts/LineChart/LineChart.tsx b/js/packages/react-ui/src/components/Charts/LineChart/LineChart.tsxindex d55b1088d..509f9992c 100644--- a/js/packages/react-ui/src/components/Charts/LineChart/LineChart.tsx+++ b/js/packages/react-ui/src/components/Charts/LineChart/LineChart.tsx@@ -355,7 +355,10 @@ export const LineChart = <T extends LineChartData>({}}/>- <ChartTooltip content={<CustomTooltipContent />} offset={15} />+ <ChartTooltip+ content={<CustomTooltipContent parentRef={mainContainerRef} />}+ offset={15}+ />{dataKeys.map((key) => {const transformedKey = transformedKeys[key];diff --git a/js/packages/react-ui/src/components/Charts/RadarChart/RadarChart.tsx b/js/packages/react-ui/src/components/Charts/RadarChart/RadarChart.tsxindex 77f33d369..6fa5db042 100644--- a/js/packages/react-ui/src/components/Charts/RadarChart/RadarChart.tsx+++ b/js/packages/react-ui/src/components/Charts/RadarChart/RadarChart.tsx@@ -168,7 +168,10 @@ const RadarChartComponent = <T extends RadarChartData>({tick={<AxisLabel portalContainerRef={wrapperRef} />}/>- <ChartTooltip cursor={false} content={<CustomTooltipContent />} />+ <ChartTooltip+ cursor={false}+ content={<CustomTooltipContent parentRef={wrapperRef} />}+ />{/* rendering the radars here */}{radars}</RechartsRadarChart>diff --git a/js/packages/react-ui/src/components/Charts/shared/PortalTooltip/CustomTooltipContent.tsx b/js/packages/react-ui/src/components/Charts/shared/PortalTooltip/CustomTooltipContent.tsxindex f423e76bf..46122a366 100644--- a/js/packages/react-ui/src/components/Charts/shared/PortalTooltip/CustomTooltipContent.tsx+++ b/js/packages/react-ui/src/components/Charts/shared/PortalTooltip/CustomTooltipContent.tsx@@ -1,5 +1,5 @@import clsx from "clsx";-import { forwardRef, memo, useMemo } from "react";+import { forwardRef, memo, useEffect, useMemo, useState } from "react";import * as RechartsPrimitive from "recharts";import { ChartStyle, getPayloadConfigFromPayload, useChart } from "../../../Charts/Charts";import { useSideBarTooltip } from "../../context/SideBarTooltipContext";@@ -24,6 +24,7 @@ export const CustomTooltipContent = memo(labelKey?: string;showPercentage?: boolean;portalContainer?: React.RefObject<HTMLElement | null>;+ parentRef: React.RefObject<HTMLElement | null>;}>((props, ref) => {const {@@ -42,12 +43,16 @@ export const CustomTooltipContent = memo(labelKey,showPercentage = false,portalContainer,+ parentRef,} = props;const { config, id } = useChart();const { isSideBarTooltipOpen } = useSideBarTooltip();const isGreaterThanTen = !!(payload?.length && payload.length > 10);const remainingItems = payload && isGreaterThanTen ? payload.length - 5 : 0;+ // this state is used to forcefully hide the tooltip when the user touches outside of the parent element+ // this is not handled by recharts+ const [forcefullyHideTooltip, setForcefullyHideTooltip] = useState(false);const tooltipLabel = useMemo(() => {if (hideLabel || !payload?.length) {@@ -182,8 +187,32 @@ export const CustomTooltipContent = memo(showPercentage,]);+ useEffect(() => {+ const parent = parentRef.current;+ if (!parent) {+ return;+ }++ const touchHandler = (e: TouchEvent) => {+ for (let i = 0; i < e.targetTouches.length; i++) {+ const target = e.targetTouches[i]!.target as HTMLElement;+ if (!parent.contains(target)) {+ setForcefullyHideTooltip(true);+ return;+ }+ }+ setForcefullyHideTooltip(false);+ };++ document.body.addEventListener("touchstart", touchHandler);++ return () => {+ document.body.removeEventListener("touchstart", touchHandler);+ };+ }, [parentRef.current]);+// Early return for inactive or empty payload - moved after all hooks- if (!active || !payload?.length || isSideBarTooltipOpen) {+ if (!active || !payload?.length || isSideBarTooltipOpen || forcefullyHideTooltip) {return null;}