From 56ce068a91de448039bf5797b19270f68f4563df Mon Sep 17 00:00:00 2001
From: Alec Posney <alec.posney@gmail.com>
Date: Fri, 5 Mar 2021 15:59:48 +1100
Subject: [PATCH] GraphNG: Fixes Tooltip mode 'All' for XYChart (#30921)
 (#31260)

---
 .../grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
index fb085c469f8..d3a5dfb0862 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
@@ -82,8 +82,8 @@ export const TooltipPlugin: React.FC<TooltipPluginProps> = ({ mode = 'single', t
           for (let i = 0; i < otherProps.data.length; i++) {
             series = series.concat(
               otherProps.data[i].fields.reduce<SeriesTableRowProps[]>((agg, f, j) => {
-                // skipping time field and non-numeric fields
-                if (f.type === FieldType.time || f.type !== FieldType.number) {
+                // skipping xField, time fields, and non-numeric fields
+                if (f === xField || f.type === FieldType.time || f.type !== FieldType.number) {
                   return agg;
                 }