From c53b2499988b5aeec96b1064f86703a3891e0efc Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:33:39 -0300
Subject: [PATCH] fix: Wrong positioning of filter tooltips on scroll (#24617)

---
 .../FilterBar/FilterControls/FilterControl.tsx       |  1 +
 .../controls/DateFilterControl/DateFilterLabel.tsx   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
index b7f2ba04f2..2d8af510dc 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
@@ -204,6 +204,7 @@ const DescriptionToolTip = ({ description }: { description: string }) => (
         WebkitBoxOrient: 'vertical',
         textOverflow: 'ellipsis',
       }}
+      getPopupContainer={trigger => trigger.parentElement as HTMLElement}
     >
       <i
         className="fa fa-info-circle text-muted"
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index a3d44eb570..d19a423814 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -365,7 +365,11 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
       }
       destroyTooltipOnHide
     >
-      <Tooltip placement="top" title={tooltipTitle}>
+      <Tooltip
+        placement="top"
+        title={tooltipTitle}
+        getPopupContainer={trigger => trigger.parentElement as HTMLElement}
+      >
         <DateLabel
           label={actualTimeRange}
           isActive={show}
@@ -379,7 +383,11 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
 
   const modalContent = (
     <>
-      <Tooltip placement="top" title={tooltipTitle}>
+      <Tooltip
+        placement="top"
+        title={tooltipTitle}
+        getPopupContainer={trigger => trigger.parentElement as HTMLElement}
+      >
         <DateLabel
           onClick={toggleOverlay}
           label={actualTimeRange}