From c28f913168e31dae57faa3f63d3e16970665b24b Mon Sep 17 00:00:00 2001
From: Uchechukwu Obasi <obasiuche62@gmail.com>
Date: Thu, 6 Jan 2022 12:28:09 +0100
Subject: [PATCH] TimePicker: fixes focus to restore when closing calendar on
 narrow screen (#43746)

---
 .../DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
index d08d072a3bc..46a7604d44c 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerCalendar.tsx
@@ -3,10 +3,9 @@ import { css } from '@emotion/css';
 import { DateTime, GrafanaTheme2, TimeZone } from '@grafana/data';
 import { useTheme2 } from '../../../themes';
 import { Header } from './CalendarHeader';
-import { Portal } from '../../Portal/Portal';
 import { selectors } from '@grafana/e2e-selectors';
 import { FocusScope } from '@react-aria/focus';
-import { useOverlay } from '@react-aria/overlays';
+import { OverlayContainer, useOverlay } from '@react-aria/overlays';
 import { Body } from './CalendarBody';
 import { Footer } from './CalendarFooter';
 
@@ -109,7 +108,7 @@ function TimePickerCalendar(props: TimePickerCalendarProps) {
   }
 
   return (
-    <Portal>
+    <OverlayContainer>
       <FocusScope contain autoFocus restoreFocus>
         <section className={styles.modal} onClick={stopPropagation} ref={ref} {...overlayProps}>
           <div className={styles.content} aria-label={selectors.components.TimePicker.calendar.label}>
@@ -120,7 +119,7 @@ function TimePickerCalendar(props: TimePickerCalendarProps) {
         </section>
       </FocusScope>
       <div className={styles.backdrop} onClick={stopPropagation} />
-    </Portal>
+    </OverlayContainer>
   );
 }
 export default memo(TimePickerCalendar);