From 3355a3ad5696660f05aa1e66456bf4eb747f2566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20FINDIKLI?= <yigitfindikli@gmail.com>
Date: Thu, 18 Nov 2021 14:37:10 +0300
Subject: [PATCH] Time Picker Check for #1744

---
 src/components/calendar/Calendar.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index f4758c65e..2cb08db08 100755
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -309,6 +309,7 @@ export default {
         style: null
     },
     navigationState: null,
+    timePickerChange: false,
     scrollHandler: null,
     outsideClickListener: null,
     maskClickListener: null,
@@ -1298,6 +1299,7 @@ export default {
             event.preventDefault();
         },
         updateModelTime() {
+            this.timePickerChange = true;
             let value = this.isComparable() ? this.modelValue : this.viewDate;
 
             if (this.isRangeSelection()) {
@@ -1334,6 +1336,7 @@ export default {
 
             this.updateModel(value);
             this.$emit('date-select', value);
+            setTimeout(() => this.timePickerChange = false, 0);
         },
         toggleAMPM(event) {
             this.pm = !this.pm;
@@ -2083,7 +2086,7 @@ export default {
             if (cell) {
                 cell.tabIndex = '0';
 
-                if (!this.navigationState || !this.navigationState.button) {
+                if ((!this.navigationState || !this.navigationState.button) && !this.timePickerChange) {
                     cell.focus();
                 }
             }