From 98eb42ddb0d64592cb2bed4884d17ca724e3fb86 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 11 Nov 2022 12:06:50 +0200
Subject: [PATCH] focus fix

---
 client/src/views/fields/date.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/src/views/fields/date.js b/client/src/views/fields/date.js
index ce304ccc68..17f6eb4a76 100644
--- a/client/src/views/fields/date.js
+++ b/client/src/views/fields/date.js
@@ -199,13 +199,17 @@ define('views/fields/date', ['views/fields/base'], function (Dep) {
 
                 let wait = false;
 
-                this.$element.on('change', () => {
+                this.$element.on('change', (e) => {
                     if (!wait) {
                         this.trigger('change');
                         wait = true;
-                        setTimeout(() => {
-                            wait = false;
-                        }, 100);
+                        setTimeout(() => wait = false, 100);
+                    }
+
+                    if (e.isTrigger) {
+                        if (document.activeElement !== this.$element.get(0)) {
+                            this.$element.focus();
+                        }
                     }
                 });
 
@@ -249,8 +253,14 @@ define('views/fields/date', ['views/fields/base'], function (Dep) {
                         this.trigger('change');
                     });
 
-                    $elAdd.on('change', () => {
+                    $elAdd.on('change', e => {
                         this.trigger('change');
+
+                        if (e.isTrigger) {
+                            if (document.activeElement !== $elAdd.get(0)) {
+                                $elAdd.focus();
+                            }
+                        }
                     });
                 }