From 87b250d7e2300bb40a1c3cd8bf0b34a443fee391 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Tue, 7 Jan 2025 13:43:42 +0000 Subject: [PATCH] Time Picker: Fix "Fiscal year start month" selection behaviour (#98576) don't close overlay when interacting with portal elements (e.g. dropdowns) --- .../src/components/DateTimePickers/TimeRangePicker.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx index ef05c435fd4..5b47ac1e84e 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx @@ -19,6 +19,7 @@ import { useStyles2 } from '../../themes/ThemeContext'; import { t, Trans } from '../../utils/i18n'; import { ButtonGroup } from '../Button'; import { getModalStyles } from '../Modal/getModalStyles'; +import { getPortalContainer } from '../Portal/Portal'; import { ToolbarButton } from '../ToolbarButton'; import { Tooltip } from '../Tooltip/Tooltip'; @@ -123,7 +124,8 @@ export function TimeRangePicker(props: TimeRangePickerProps) { isDismissable: true, isOpen, shouldCloseOnInteractOutside: (element) => { - return !buttonRef.current?.contains(element); + const portalContainer = getPortalContainer(); + return !buttonRef.current?.contains(element) && !portalContainer.contains(element); }, }, overlayRef