From 3d60298d4891711706057dd058ce42409d52bbbf Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 13 Dec 2022 15:28:30 +0100
Subject: [PATCH] [v9.3.x] TimePicker: Fix time picker selection (#60246)

TimePicker: Fix time picker selection (#60104)

fix time picker selection

(cherry picked from commit 4e7a316903090352ab56d00588dd4d79159bd61b)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 .../components/DateTimePickers/TimeRangePicker.tsx   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
index 129e9a3a2c1..0aa35fca698 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
@@ -125,10 +125,10 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
         </ToolbarButton>
       </Tooltip>
       {isOpen && (
-        <>
+        <div>
           <div role="presentation" className={cx(modalBackdrop, styles.backdrop)} {...underlayProps} />
-          <section className={styles.content} ref={ref} {...overlayProps} {...dialogProps}>
-            <FocusScope contain autoFocus>
+          <FocusScope contain autoFocus>
+            <section className={styles.content} ref={ref} {...overlayProps} {...dialogProps}>
               <TimePickerContent
                 timeZone={timeZone}
                 fiscalYearStartMonth={fiscalYearStartMonth}
@@ -142,9 +142,9 @@ export function TimeRangePicker(props: TimeRangePickerProps) {
                 onChangeFiscalYearStartMonth={onChangeFiscalYearStartMonth}
                 hideQuickRanges={hideQuickRanges}
               />
-            </FocusScope>
-          </section>
-        </>
+            </section>
+          </FocusScope>
+        </div>
       )}
 
       {timeSyncButton}