From a7944cfa7987e88f24e87babe4fbd92a99af2e2e Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 10 Jun 2022 17:36:11 +0300
Subject: [PATCH 1/4] [SSE] Fix search in mail merge mode

---
 apps/spreadsheeteditor/main/app/controller/Toolbar.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index f6aacc411..92ecc9081 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -1317,7 +1317,11 @@ define([
         },
 
         searchShow: function () {
-            if (this.toolbar.btnSearch && this.searchBar && !this.searchBar.isVisible()) {
+            if (this.toolbar.btnSearch) {
+                if (this.searchBar && this.searchBar.isVisible()) {
+                    this.searchBar.focus();
+                    return;
+                }
                 this.toolbar.btnSearch.toggle(true);
             }
         },

From b372667e668ec35ec4890a03d53e2d50275c0008 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 10 Jun 2022 18:55:12 +0300
Subject: [PATCH 2/4] [DE PE SSE] Fix header of plugin panel

---
 apps/common/main/lib/view/Plugins.js         | 16 ++++++++---
 apps/common/main/resources/less/plugins.less | 29 ++++++++++----------
 apps/documenteditor/main/locale/en.json      |  1 +
 apps/presentationeditor/main/locale/en.json  |  1 +
 apps/spreadsheeteditor/main/locale/en.json   |  1 +
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index 75ed76e8b..37c97cc1d 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -60,11 +60,11 @@ define([
                 '</div>',
             '</div>',
             '<div id="current-plugin-box" class="layout-ct vbox hidden">',
+                '<div id="current-plugin-frame" class="">',
+                '</div>',
                 '<div id="current-plugin-header">',
                     '<label></label>',
-                    '<div id="id-plugin-close" class="tool close"></div>',
-                '</div>',
-                '<div id="current-plugin-frame" class="">',
+                    '<div id="id-plugin-close" class="close"></div>',
                 '</div>',
             '</div>',
             '<div id="plugins-mask" style="display: none;">'
@@ -111,6 +111,13 @@ define([
             this.currentPluginPanel = $('#current-plugin-box');
             this.currentPluginFrame = $('#current-plugin-frame');
 
+            this.pluginClose = new Common.UI.Button({
+                parentEl: $('#id-plugin-close'),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-close',
+                hint: this.textClosePanel
+            });
+
             this.pluginMenu = new Common.UI.Menu({
                 menuAlign   : 'tr-br',
                 items: []
@@ -426,7 +433,8 @@ define([
         textLoading: 'Loading',
         textStart: 'Start',
         textStop: 'Stop',
-        groupCaption: 'Plugins'
+        groupCaption: 'Plugins',
+        textClosePanel: 'Close plugin'
 
     }, Common.Views.Plugins || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less
index bc9d154fd..1bba907aa 100644
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@@ -80,17 +80,20 @@
 
     #current-plugin-header {
         position: absolute;
-        top: 0;
+        height: 45px;
         left: 0;
-        width: 100%;
-        height: 38px;
-        padding: 10px 12px;
+        top: 0;
+        right: 0;
+        padding: 12px;
+        overflow: hidden;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-bottom: @scaled-one-px-value solid @border-toolbar;
-        
+
         label {
             width: 100%;
+            margin-top: 2px;
             padding-right: 20px;
+            font-size: 12px;
             .font-weight-bold();
             overflow: hidden;
             text-overflow: ellipsis;
@@ -98,20 +101,18 @@
         }
     }
 
-    .tool {
+    .close {
         position: absolute;
-        top: 9px;
-        right: 7px;
-        margin: 0;
-        /*&:before, &:after {
-            width: 2px;
-            width: @scaled-two-px-value;
-        }*/
+        width: 20px;
+        height: 20px;
+        top: 12px;
+        right: 12px;
     }
+
     #current-plugin-frame {
         width: 100%;
         height: 100%;
-        padding-top: 38px;
+        padding-top: 45px;
     }
 }
 
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 798ea77eb..8c2bd088d 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -347,6 +347,7 @@
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
   "Common.Views.Plugins.textStop": "Stop",
+  "Common.Views.Plugins.textClosePanel": "Close plugin",
   "Common.Views.Protection.hintAddPwd": "Encrypt with password",
   "Common.Views.Protection.hintPwd": "Change or delete password",
   "Common.Views.Protection.hintSignature": "Add digital signature or signature line",
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 5dabb151e..3c4325c4c 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -449,6 +449,7 @@
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
   "Common.Views.Plugins.textStop": "Stop",
+  "Common.Views.Plugins.textClosePanel": "Close plugin",
   "Common.Views.Protection.hintAddPwd": "Encrypt with password",
   "Common.Views.Protection.hintPwd": "Change or delete password",
   "Common.Views.Protection.hintSignature": "Add digital signature or signature line",
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 443082f74..6c93b5510 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -304,6 +304,7 @@
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
   "Common.Views.Plugins.textStop": "Stop",
+  "Common.Views.Plugins.textClosePanel": "Close plugin",
   "Common.Views.Protection.hintAddPwd": "Encrypt with password",
   "Common.Views.Protection.hintPwd": "Change or delete password",
   "Common.Views.Protection.hintSignature": "Add digital signature or signature line",

From b176e9a862959e54534c118c485b1a04f1cd9f41 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 14 Jun 2022 17:47:35 +0300
Subject: [PATCH 3/4] Remove jszip, jszip-utils

---
 apps/documenteditor/forms/app.js              |  6 +----
 apps/documenteditor/forms/app_dev.js          |  4 ----
 apps/documenteditor/main/app.js               |  6 +----
 apps/documenteditor/main/app_dev.js           |  4 ----
 .../mobile/src/controller/Main.jsx            |  4 +---
 apps/presentationeditor/main/app.js           |  6 +----
 apps/presentationeditor/main/app_dev.js       |  4 ----
 apps/spreadsheeteditor/embed/index.html       |  2 --
 .../spreadsheeteditor/embed/index.html.deploy |  2 --
 .../spreadsheeteditor/embed/index_loader.html |  2 --
 .../embed/index_loader.html.deploy            |  2 --
 apps/spreadsheeteditor/main/app.js            |  6 +----
 apps/spreadsheeteditor/main/app_dev.js        |  4 ----
 .../mobile/src/controller/Main.jsx            |  4 +---
 build/Gruntfile.js                            |  4 ----
 build/appforms.json                           |  6 +----
 build/common.json                             | 24 -------------------
 build/documenteditor.json                     |  6 +----
 build/presentationeditor.json                 |  6 +----
 build/spreadsheeteditor.json                  |  6 +----
 test/spreadsheeteditor/main/index.html        |  3 ---
 21 files changed, 10 insertions(+), 101 deletions(-)

diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js
index 273f140f5..9ec2b7522 100644
--- a/apps/documenteditor/forms/app.js
+++ b/apps/documenteditor/forms/app.js
@@ -47,8 +47,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/word/sdk-all-min',
         api             : 'api/documents/api',
@@ -102,9 +100,7 @@ require.config({
                 'underscore',
                 'allfonts',
                 'xregexp',
-                'sockjs',
-                'jszip',
-                'jsziputils'
+                'sockjs'
             ]
         },
         gateway: {
diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js
index 93a96c2d5..d0ff647a7 100644
--- a/apps/documenteditor/forms/app_dev.js
+++ b/apps/documenteditor/forms/app_dev.js
@@ -47,8 +47,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
@@ -115,8 +113,6 @@ require([
     'analytics',
     'gateway',
     'locale',
-    'jszip',
-    'jsziputils',
     'sockjs',
     'underscore'
 ], function (Backbone, Bootstrap, Core) {
diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index e6a4ded43..ee567e211 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/word/sdk-all-min',
         api             : 'api/documents/api',
@@ -109,9 +107,7 @@ require.config({
                 'underscore',
                 'allfonts',
                 'xregexp',
-                'sockjs',
-                'jszip',
-                'jsziputils'
+                'sockjs'
             ]
         },
         gateway: {
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index ebb623df1..990fa4823 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
@@ -122,8 +120,6 @@ require([
     'analytics',
     'gateway',
     'locale',
-    'jszip',
-    'jsziputils',
     'sockjs',
 	'underscore'
 ], function (Backbone, Bootstrap, Core) {
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index d7408414a..8380ac185 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -60,9 +60,7 @@ class MainController extends Component {
             !window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js',
                                                             '../../../../sdkjs/word/sdk-all-min.js']);
             let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
-                                '../../../vendor/sockjs/sockjs.min.js',
-                                '../../../vendor/jszip/jszip.min.js',
-                                '../../../vendor/jszip-utils/jszip-utils.min.js'];
+                                '../../../vendor/sockjs/sockjs.min.js'];
             dep_scripts.push(...window.sdk_scripts);
 
             const promise_get_script = (scriptpath) => {
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index e18ce4ee0..089bd6906 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/slide/sdk-all-min',
         api             : 'api/documents/api',
@@ -108,9 +106,7 @@ require.config({
                 'underscore',
                 'allfonts',
                 'xregexp',
-                'sockjs',
-                'jszip',
-                'jsziputils'
+                'sockjs'
             ]
         },
         gateway: {
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index cf8684101..2cf067eaa 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
@@ -121,8 +119,6 @@ require([
     'analytics',
     'gateway',
     'locale',
-    'jszip',
-    'jsziputils',
     'sockjs',
     'xregexp',
     'underscore'
diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html
index 99174196f..01aae5619 100644
--- a/apps/spreadsheeteditor/embed/index.html
+++ b/apps/spreadsheeteditor/embed/index.html
@@ -255,8 +255,6 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
 
       <script src="../../../vendor/requirejs/require.js"></script>
       <script>
diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy
index eb9dbabea..3bf4b42b7 100644
--- a/apps/spreadsheeteditor/embed/index.html.deploy
+++ b/apps/spreadsheeteditor/embed/index.html.deploy
@@ -247,8 +247,6 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
       <script src="../../../vendor/requirejs/require.js"></script>
       <script>
           require.config({
diff --git a/apps/spreadsheeteditor/embed/index_loader.html b/apps/spreadsheeteditor/embed/index_loader.html
index 9aa8b85ad..3c4f5a914 100644
--- a/apps/spreadsheeteditor/embed/index_loader.html
+++ b/apps/spreadsheeteditor/embed/index_loader.html
@@ -329,8 +329,6 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
 
       <script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/cell/scripts.js"></script>
       <script>
diff --git a/apps/spreadsheeteditor/embed/index_loader.html.deploy b/apps/spreadsheeteditor/embed/index_loader.html.deploy
index d463a09fd..dc420fead 100644
--- a/apps/spreadsheeteditor/embed/index_loader.html.deploy
+++ b/apps/spreadsheeteditor/embed/index_loader.html.deploy
@@ -321,8 +321,6 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
 
       <!--sdk-->
       <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js
index 8fea0368f..42fff9d89 100644
--- a/apps/spreadsheeteditor/main/app.js
+++ b/apps/spreadsheeteditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/cell/sdk-all-min',
         api             : 'api/documents/api',
@@ -108,9 +106,7 @@ require.config({
                 'underscore',
                 'allfonts',
                 'xregexp',
-                'sockjs',
-                'jszip',
-                'jsziputils'
+                'sockjs'
             ]
         },
         gateway: {
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index d634c7aa0..af9d5b6f7 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
-        jszip           : '../vendor/jszip/jszip.min',
-        jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
@@ -121,8 +119,6 @@ require([
     'analytics',
     'gateway',
     'locale',
-    'jszip',
-    'jsziputils',
 	'sockjs',
 	'underscore'
 ], function (Backbone, Bootstrap, Core) {
diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
index de031d0e1..de2cd357d 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -71,9 +71,7 @@ class MainController extends Component {
                 '../../../vendor/bootstrap/dist/js/bootstrap.min.js',
                 '../../../vendor/underscore/underscore-min.js',
                 '../../../vendor/xregexp/xregexp-all-min.js',
-                '../../../vendor/sockjs/sockjs.min.js',
-                '../../../vendor/jszip/jszip.min.js',
-                '../../../vendor/jszip-utils/jszip-utils.min.js'];
+                '../../../vendor/sockjs/sockjs.min.js'];
             dep_scripts.push(...window.sdk_scripts);
 
             const promise_get_script = (scriptpath) => {
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index db261ec31..246d2d13d 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -282,8 +282,6 @@ module.exports = function(grunt) {
     doRegisterTask('iscroll');
     doRegisterTask('fetch');
     doRegisterTask('es6-promise');
-    doRegisterTask('jszip');
-    doRegisterTask('jsziputils');
     doRegisterTask('common-embed');
     doRegisterTask('requirejs', function(defaultConfig, packageFile) {
         return {
@@ -674,8 +672,6 @@ module.exports = function(grunt) {
     grunt.registerTask('deploy-iscroll',                ['iscroll-init', 'clean', 'copy']);
     grunt.registerTask('deploy-fetch',                  ['fetch-init', 'clean', 'copy']);
     grunt.registerTask('deploy-bootstrap',              ['bootstrap-init', 'clean', 'copy']);
-    grunt.registerTask('deploy-jszip',                  ['jszip-init', 'clean', 'copy']);
-    grunt.registerTask('deploy-jsziputils',             ['jsziputils-init', 'clean', 'copy']);
     grunt.registerTask('deploy-requirejs',              ['requirejs-init', 'clean', 'terser']);
     grunt.registerTask('deploy-es6-promise',            ['es6-promise-init', 'clean', 'copy']);
     grunt.registerTask('deploy-common-embed',           ['common-embed-init', 'clean', 'copy']);
diff --git a/build/appforms.json b/build/appforms.json
index 12b4e77c2..7a2f2ed9c 100644
--- a/build/appforms.json
+++ b/build/appforms.json
@@ -33,8 +33,6 @@
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
                         "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -87,9 +85,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
+                                "sockjs"
                             ]
                         },
                         "gateway": {
diff --git a/build/common.json b/build/common.json
index 2dd34ff01..ce6987efa 100644
--- a/build/common.json
+++ b/build/common.json
@@ -202,28 +202,6 @@
             }
         }
     },
-    "jszip": {
-        "clean": [
-            "../deploy/web-apps/vendor/jszip"
-        ],
-        "copy": {
-            "script": {
-                "src": "../vendor/jszip/jszip.min.js",
-                "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
-            }
-        }
-    },
-    "jsziputils": {
-        "clean": [
-            "../deploy/web-apps/vendor/jszip-utils"
-        ],
-        "copy": {
-            "script": {
-                "src": "../vendor/jszip-utils/jszip-utils.min.js",
-                "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
-            }
-        }
-    },
     "underscore": {
         "clean": [
             "../deploy/web-apps/vendor/underscore"
@@ -303,8 +281,6 @@
             "deploy-bootstrap",
             "deploy-iscroll",
             "deploy-fetch",
-            "deploy-jszip",
-            "deploy-jsziputils",
             "deploy-es6-promise",
             "deploy-common-embed"
         ]
diff --git a/build/documenteditor.json b/build/documenteditor.json
index 47cfe95a9..249a38666 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -31,8 +31,6 @@
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
                         "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -85,9 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
+                                "sockjs"
                             ]
                         },
                         "gateway": {
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index 5531492f2..209a62b4d 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -31,8 +31,6 @@
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
                         "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -85,9 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
+                                "sockjs"
                             ]
                         },
                         "gateway": {
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index 11c4e50a7..267dc61ad 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -31,8 +31,6 @@
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
                         "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -85,9 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
+                                "sockjs"
                             ]
                         },
                         "gateway": {
diff --git a/test/spreadsheeteditor/main/index.html b/test/spreadsheeteditor/main/index.html
index f36a0cf78..9ee008707 100644
--- a/test/spreadsheeteditor/main/index.html
+++ b/test/spreadsheeteditor/main/index.html
@@ -116,9 +116,6 @@
         <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
         <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
         <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-        <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-        <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
-
         <script src="../../../vendor/requirejs/require.js"></script>
         <script>
             require.config({

From f8c92f4b70fc67d24af3d1b7c2b767db39aff6a7 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 14 Jun 2022 20:55:24 +0300
Subject: [PATCH 4/4] [DE PE SSE] Fix open search using alt + key, fix repeated
 hints

---
 apps/common/main/lib/controller/HintManager.js              | 2 +-
 apps/documenteditor/main/app/view/Toolbar.js                | 2 +-
 apps/spreadsheeteditor/main/app/template/StatusBar.template | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js
index 548d6e048..a946ad0f4 100644
--- a/apps/common/main/lib/controller/HintManager.js
+++ b/apps/common/main/lib/controller/HintManager.js
@@ -568,7 +568,7 @@ Common.UI.HintManager = new(function() {
                                 if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
                                     curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
                                     curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' ||
-                                    curr.prop('id') === 'left-btn-support') {
+                                    curr.prop('id') === 'left-btn-support' || curr.closest('.btn-slot').prop('id') === 'slot-btn-search') {
                                     _resetToDefault();
                                     return;
                                 }
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 3f289d33b..843c688f9 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -175,7 +175,7 @@ define([
                                 {caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'},
                                 {caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'},
                                 {caption: me.textTabLayout, action: 'layout', extcls: 'canedit', layoutname: 'toolbar-layout', dataHintTitle: 'L'},
-                                {caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'R'}
+                                {caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'N'}
                                 // undefined, undefined, undefined, undefined,
                             ]
                         }
diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template
index 68367459b..e7ab60c19 100644
--- a/apps/spreadsheeteditor/main/app/template/StatusBar.template
+++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template
@@ -7,7 +7,7 @@
     <div id="status-addtabs-box" class="status-group">
         <button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="X"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
         <div class="cnt-tabslist">
-            <button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="V"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
+            <button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="N"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
         </div>
     </div>
     <div id="status-zoom-box" class="status-group">