From d43606cd3e02a7b3ba35fd66177782de7469398d Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Tue, 22 Jul 2025 12:07:34 -0500
Subject: [PATCH] XYChart: Fix hideFrom.tooltip (#108359)

---
 .../plugins/panel/xychart/XYChartTooltip.tsx  | 62 ++++++++++++-------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/public/app/plugins/panel/xychart/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/XYChartTooltip.tsx
index f72a67b7b5e..6760621fd82 100644
--- a/public/app/plugins/panel/xychart/XYChartTooltip.tsx
+++ b/public/app/plugins/panel/xychart/XYChartTooltip.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { colorManipulator, DataFrame, InterpolateFunction, LinkModel } from '@grafana/data';
+import { colorManipulator, DataFrame, Field, InterpolateFunction, LinkModel } from '@grafana/data';
 import {
   VizTooltipContent,
   VizTooltipFooter,
@@ -34,6 +34,14 @@ function stripSeriesName(fieldName: string, seriesName: string) {
   return fieldName;
 }
 
+function hideFromTooltip(field: Field) {
+  return field.config.custom.hideFrom?.tooltip ?? false;
+}
+
+function getFieldName(field: Field) {
+  return field.state?.displayName ?? field.name;
+}
+
 export const XYChartTooltip = ({
   dataIdxs,
   seriesIdx,
@@ -70,37 +78,49 @@ export const XYChartTooltip = ({
     colorIndicator: ColorIndicator.marker_md,
   };
 
-  const contentItems: VizTooltipItem[] = [
-    {
-      label: stripSeriesName(xField.state?.displayName ?? xField.name, label),
-      value: fmt(xField, xField.values[rowIndex]),
-    },
-    {
-      label: stripSeriesName(yField.state?.displayName ?? yField.name, label),
-      value: fmt(yField, yField.values[rowIndex]),
-    },
-  ];
+  const contentItems: VizTooltipItem[] = [];
+  const addedFields = new Set<Field>();
 
-  // mapped fields for size/color
-  if (sizeField != null && sizeField !== yField) {
+  if (!hideFromTooltip(xField)) {
     contentItems.push({
-      label: stripSeriesName(sizeField.state?.displayName ?? sizeField.name, label),
-      value: fmt(sizeField, sizeField.values[rowIndex]),
+      label: stripSeriesName(getFieldName(xField), label),
+      value: fmt(xField, xField.values[rowIndex]),
     });
+    addedFields.add(xField);
   }
 
-  if (colorField != null && colorField !== yField) {
+  if (!hideFromTooltip(yField)) {
     contentItems.push({
-      label: stripSeriesName(colorField.state?.displayName ?? colorField.name, label),
+      label: stripSeriesName(getFieldName(yField), label),
+      value: fmt(yField, yField.values[rowIndex]),
+    });
+    addedFields.add(yField);
+  }
+
+  // mapped fields for size/color
+  if (sizeField != null && !addedFields.has(sizeField) && !hideFromTooltip(sizeField)) {
+    contentItems.push({
+      label: stripSeriesName(getFieldName(sizeField), label),
+      value: fmt(sizeField, sizeField.values[rowIndex]),
+    });
+    addedFields.add(sizeField);
+  }
+
+  if (colorField != null && !addedFields.has(colorField) && !hideFromTooltip(colorField)) {
+    contentItems.push({
+      label: stripSeriesName(getFieldName(colorField), label),
       value: fmt(colorField, colorField.values[rowIndex]),
     });
+    addedFields.add(colorField);
   }
 
   series._rest.forEach((field) => {
-    contentItems.push({
-      label: stripSeriesName(field.state?.displayName ?? field.name, label),
-      value: fmt(field, field.values[rowIndex]),
-    });
+    if (!hideFromTooltip(field)) {
+      contentItems.push({
+        label: stripSeriesName(field.state?.displayName ?? field.name, label),
+        value: fmt(field, field.values[rowIndex]),
+      });
+    }
   });
 
   let footer: ReactNode;