UXPLATFORM-10400 DatePicker focus fixed for mobile view

cerner · May 16, 2024 · efec564 · efec564
1 parent 2f632db
commit efec564
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/terra-date-picker/src/DatePicker.jsx b/packages/terra-date-picker/src/DatePicker.jsx
@@ -258,7 +258,6 @@ class DatePicker extends React.Component {
     if (this.props.onSelect) {
       this.props.onSelect(event, selectedDate.format(DateUtil.ISO_EXTENDED_DATE_FORMAT));
     }
-
     if (!this.props.disableButtonFocusOnClose) {
       // Allows time for focus-trap to release focus on the picker before returning focus to the calendar button.
       setTimeout(() => {
@@ -275,6 +274,11 @@ class DatePicker extends React.Component {
   }
 
   handleOnClickOutside(event) {
+    setTimeout(() => {
+      if (this.calendarButton) {
+        this.calendarButton.focus();
+      }
+    }, 100);
     if (this.props.onClickOutside) {
       this.props.onClickOutside(event);
     }