PR feedback: improve comment, plus fix click bug

uwblueprint · Nov 15, 2023 · 68887bc · 68887bc
1 parent 5a68a25
commit 68887bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/frontend/src/components/common/form/DateTimePicker.tsx b/frontend/src/components/common/form/DateTimePicker.tsx
@@ -33,12 +33,12 @@ const DateTimePicker = ({
       onChange(combineDateAndTime(newDate, timeValue));
     }
 
-    // For some reason, the time picker doesn't focus properly if we click it
-    // while the date picker is open. This is a workaround to make sure the
-    // click happens after the date picker has started to close.
+    // For some reason, the time picker doesn't focus properly if we try to
+    // focus it while the date picker is open. This is a workaround to make
+    // sure the focus happens after the date picker has started to close.
     setTimeout(() => {
       timePickerRef.current?.click();
-    }, 0);
+    });
   };
 
   const handleTimeChange = (newTime: Date | null) => {

diff --git a/frontend/src/components/common/form/TimePicker.tsx b/frontend/src/components/common/form/TimePicker.tsx
@@ -152,7 +152,13 @@ const TimePicker = forwardRef(function TimePicker(
               minuteInputRef.current?.focus();
             }}
             onFocus={() => {
-              hourInputRef.current?.openMenu("first");
+              setTimeout(() => {
+                // For use with a date picker, our date picker will focus itself
+                // when it starts to close. This means that we might need to re-
+                // focus the hour input afterwards.
+                hourInputRef.current?.focus();
+                hourInputRef.current?.openMenu("first");
+              });
             }}
             options={HOUR_OPTIONS}
             placeholder="00"