From 597d275dde9f3e557e048bf2ce367f3195fbf617 Mon Sep 17 00:00:00 2001
From: Lacey <pro7@cdc.gov>
Date: Thu, 27 Feb 2025 12:58:05 -0500
Subject: [PATCH] fix [new-50343] tooltip additional column

---
 .../src/components/BarChart/components/BarChart.Horizontal.tsx | 2 +-
 .../BarChart/components/BarChart.StackedHorizontal.tsx         | 2 +-
 .../BarChart/components/BarChart.StackedVertical.tsx           | 2 +-
 packages/chart/src/hooks/useBarChart.ts                        | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/chart/src/components/BarChart/components/BarChart.Horizontal.tsx b/packages/chart/src/components/BarChart/components/BarChart.Horizontal.tsx
index 3d1ecf335..64f35cedc 100644
--- a/packages/chart/src/components/BarChart/components/BarChart.Horizontal.tsx
+++ b/packages/chart/src/components/BarChart/components/BarChart.Horizontal.tsx
@@ -159,7 +159,7 @@ export const BarChartHorizontal = () => {
                   let yAxisTooltip = config.runtime.yAxis.label
                     ? `${config.runtime.yAxis.label}: ${xAxisValue}`
                     : xAxisValue
-                  const additionalColTooltip = getAdditionalColumn(hoveredBar)
+                  const additionalColTooltip = getAdditionalColumn(bar.key, hoveredBar)
                   const tooltipBody = `${config.runtime.seriesLabels[bar.key]}: ${yAxisValue}`
                   const tooltip = `<ul>
                   <li class="tooltip-heading"">${yAxisTooltip}</li>
diff --git a/packages/chart/src/components/BarChart/components/BarChart.StackedHorizontal.tsx b/packages/chart/src/components/BarChart/components/BarChart.StackedHorizontal.tsx
index 991afded8..a8ba7d8c1 100644
--- a/packages/chart/src/components/BarChart/components/BarChart.StackedHorizontal.tsx
+++ b/packages/chart/src/components/BarChart/components/BarChart.StackedHorizontal.tsx
@@ -76,7 +76,7 @@ const BarChartStackedHorizontal = () => {
                   ? `${config.runtime.yAxis.label}: ${yAxisValue}`
                   : yAxisValue
                 const textWidth = getTextWidth(xAxisValue)
-                const additionalColTooltip = getAdditionalColumn(hoveredBar)
+                const additionalColTooltip = getAdditionalColumn(bar.key, hoveredBar)
                 const tooltipBody = `${config.runtime.seriesLabels[bar.key]}: ${xAxisValue}`
                 const tooltip = `<ul>
                   <li class="tooltip-heading"">${yAxisTooltip}</li>
diff --git a/packages/chart/src/components/BarChart/components/BarChart.StackedVertical.tsx b/packages/chart/src/components/BarChart/components/BarChart.StackedVertical.tsx
index ea91d25bf..d03870e75 100644
--- a/packages/chart/src/components/BarChart/components/BarChart.StackedVertical.tsx
+++ b/packages/chart/src/components/BarChart/components/BarChart.StackedVertical.tsx
@@ -69,7 +69,7 @@ const BarChartStackedVertical = () => {
                 const xAxisTooltip = config.runtime.xAxis.label
                   ? `${config.runtime.xAxis.label}: ${xAxisValue}`
                   : xAxisValue
-                const additionalColTooltip = getAdditionalColumn(hoveredBar)
+                const additionalColTooltip = getAdditionalColumn(bar.key, hoveredBar)
                 const tooltipBody = `${config.runtime.seriesLabels[bar.key]}: ${yAxisValue}`
                 const tooltip = `<ul>
                   <li class="tooltip-heading"">${xAxisTooltip}</li>
diff --git a/packages/chart/src/hooks/useBarChart.ts b/packages/chart/src/hooks/useBarChart.ts
index feacf2bf8..194d7c350 100644
--- a/packages/chart/src/hooks/useBarChart.ts
+++ b/packages/chart/src/hooks/useBarChart.ts
@@ -200,7 +200,8 @@ export const useBarChart = () => {
         return d[config.xAxis.dataKey] === xAxisDataValue && dynamicCategoryMatch
       }) || {}
     Object.keys(columns).forEach(colKeys => {
-      if (series && config.columns[colKeys].series && config.columns[colKeys].series !== series) return
+      const colConfig = config.columns[colKeys]
+      if (series && colConfig.series && colConfig.series !== series && !colConfig.tooltips) return
       const formattingParams = {
         addColPrefix: config.columns[colKeys].prefix,
         addColSuffix: config.columns[colKeys].suffix,