From 28c9471eaee264c7dab9c89ec2b4c5c442c13f68 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 15 Apr 2021 01:24:55 +0300
Subject: [PATCH] [DE] Fix button focus

---
 apps/common/main/lib/extend/Bootstrap.js             | 6 ++++++
 apps/documenteditor/main/app/view/BookmarksDialog.js | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/lib/extend/Bootstrap.js b/apps/common/main/lib/extend/Bootstrap.js
index 1b2109d3d..88d24f543 100755
--- a/apps/common/main/lib/extend/Bootstrap.js
+++ b/apps/common/main/lib/extend/Bootstrap.js
@@ -56,6 +56,12 @@ function onDropDownKeyDown(e) {
                 e.stopPropagation();
             }
         }
+    } else if ($this.hasClass('move-focus')) {
+        if (!(/^(27|13|9|32)/.test(e.keyCode) && !e.ctrlKey && !e.altKey)) {
+            patchDropDownKeyDown.call(this, e);
+            e.preventDefault();
+            e.stopPropagation();
+        }
     } else {
         patchDropDownKeyDown.call(this, e);
         e.preventDefault();
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js
index e0c0ccf46..3db375679 100644
--- a/apps/documenteditor/main/app/view/BookmarksDialog.js
+++ b/apps/documenteditor/main/app/view/BookmarksDialog.js
@@ -92,7 +92,7 @@ define([
                                         '<td class="padding-large">',
                                             '<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 5px;">', me.textGoto,'</button>',
                                             '<div style="display: inline-block; position: relative;">',
-                                                '<button type="button" class="btn btn-text-default auto dropdown-toggle" id="bookmarks-btn-link" style="min-width: 75px;" data-toggle="dropdown">', me.textGetLink,'</button>',
+                                                '<button type="button" class="btn btn-text-default auto dropdown-toggle move-focus" id="bookmarks-btn-link" style="min-width: 75px;" data-toggle="dropdown">', me.textGetLink,'</button>',
                                                 '<div id="id-clip-copy-box" class="dropdown-menu" style="width: 291px; left: -80px; padding: 10px;">',
                                                     '<div id="id-dlg-clip-copy"></div>',
                                                     '<button id="id-dlg-copy-btn" class="btn btn-text-default" style="margin-left: 5px; width: 86px;">' + me.textCopy + '</button>',
@@ -249,7 +249,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.txtName, this.radioName, this.radioLocation, this.bookmarksList, this.chHidden];
+            return [this.txtName, this.radioName, this.radioLocation, this.bookmarksList, this.btnAdd, this.btnGoto, this.btnGetLink, this.btnDelete, this.chHidden];
         },
 
         afterRender: function() {