From 14cf16f2016047cd7a328b6584cfaff0e5d3ee13 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 8 Feb 2022 19:03:44 +0300
Subject: [PATCH 01/52] [DE] Make new search bar

---
 apps/common/main/lib/view/Header.js           |  10 ++
 apps/common/main/lib/view/SearchBar.js        | 100 ++++++++++++++++++
 .../main/app/controller/Viewport.js           |  14 +++
 3 files changed, 124 insertions(+)
 create mode 100644 apps/common/main/lib/view/SearchBar.js

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 61d10d6fa..5dbf268b8 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -100,6 +100,7 @@ define([
                                     '<div class="btn-slot" id="slot-btn-mode"></div>' +
                                     '<div class="btn-slot" id="slot-btn-back"></div>' +
                                     '<div class="btn-slot" id="slot-btn-favorite"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-search"></div>' +
                                     '<div class="btn-slot" id="slot-btn-options"></div>' +
                                 '</div>' +
                                 '<div class="hedset">' +
@@ -457,6 +458,14 @@ define([
                     reset   : onResetUsers
                 });
 
+                me.btnSearch = new Common.UI.Button({
+                    cls: 'btn-header no-caret',
+                    iconCls: 'toolbar__icon icon--inverse btn-menu-search',
+                    dataHint: '0',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'big'
+                });
+
                 me.btnOptions = new Common.UI.Button({
                     cls: 'btn-header no-caret',
                     iconCls: 'toolbar__icon icon--inverse btn-ic-options',
@@ -563,6 +572,7 @@ define([
                         if ( config.canEdit && config.canRequestEditRights )
                             this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big');
                     }
+                    me.btnSearch.render($html.find('#slot-btn-search'));
                     me.btnOptions.render($html.find('#slot-btn-options'));
 
                     if (!config.isEdit || config.customization && !!config.customization.compactHeader) {
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
new file mode 100644
index 000000000..5d963f0c6
--- /dev/null
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -0,0 +1,100 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ *    SearchBar.js
+ *
+ *    Created by Julia Svinareva on 03.02.2022
+ *    Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window'
+], function () {
+    'use strict';
+
+    Common.UI.SearchBar = Common.UI.Window.extend(_.extend({
+        options: {
+            modal: false,
+            width: 328,
+            height: 54,
+            header: false,
+            cls: 'search-bar'
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, options || {});
+
+            this.template = [
+                '<div class="box">',
+                'jghjgj',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+
+
+            this.on('animate:before', _.bind(this.focus, this));
+
+            return this;
+        },
+
+        show: function(x, y) {
+            Common.UI.Window.prototype.show.call(this, x, y);
+
+
+            this.focus();
+        },
+
+        focus: function() {
+            var me  = this;
+            setTimeout(function(){
+
+            }, 10);
+        },
+
+        getSettings: function() {
+            return {
+
+            };
+        },
+
+    }, Common.UI.SearchBar || {}));
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index d8258c6e8..ec93ef631 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -44,6 +44,7 @@
 define([
     'core',
     'common/main/lib/view/Header',
+    'common/main/lib/view/SearchBar',
     'documenteditor/main/app/view/Viewport',
     'documenteditor/main/app/view/LeftMenu'
 ], function (Viewport) {
@@ -332,6 +333,7 @@ define([
                     cls     : 'btn-toolbar'
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
+                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
                 if ( !Common.UI.Themes.isDarkTheme() ) {
                     me.header.menuItemsDarkMode.hide();
@@ -460,6 +462,18 @@ define([
             this.header && this.header.lockHeaderBtns( 'rename-user', disable);
         },
 
+        onSearchClick: function () {
+            if ( !this.searchBar ) {
+                this.searchBar = (new Common.UI.SearchBar({
+                }));
+            }
+
+            var top = $('#app-title').height() + $('#toolbar').height() + 2,
+                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.searchBar.options.width - 32;
+
+            this.searchBar.show(left, top);
+        },
+
         textFitPage: 'Fit to Page',
         textFitWidth: 'Fit to Width',
         txtDarkMode: 'Dark mode'

From d00d8c428dacbfdef6bcfa22210e1de40e6dc0ab Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 9 Feb 2022 21:15:36 +0300
Subject: [PATCH 02/52] [DE] Make new search, add controller

---
 apps/common/main/lib/view/Header.js           |  1 +
 apps/common/main/lib/view/SearchBar.js        | 61 +++++++++++--
 .../main/resources/less/searchdialog.less     | 18 ++++
 apps/documenteditor/main/app.js               |  2 +
 .../main/app/controller/Main.js               |  6 +-
 .../main/app/controller/Search.js             | 87 +++++++++++++++++++
 .../main/app/controller/Viewport.js           | 22 +++--
 apps/documenteditor/main/app_dev.js           |  2 +
 8 files changed, 184 insertions(+), 15 deletions(-)
 create mode 100644 apps/documenteditor/main/app/controller/Search.js

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 5dbf268b8..6622a1fa8 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -461,6 +461,7 @@ define([
                 me.btnSearch = new Common.UI.Button({
                     cls: 'btn-header no-caret',
                     iconCls: 'toolbar__icon icon--inverse btn-menu-search',
+                    enableToggle: true,
                     dataHint: '0',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'big'
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 5d963f0c6..b2605d287 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -49,7 +49,8 @@ define([
             width: 328,
             height: 54,
             header: false,
-            cls: 'search-bar'
+            cls: 'search-bar',
+            alias: 'SearchBar'
         },
 
         initialize : function(options) {
@@ -57,28 +58,59 @@ define([
 
             this.template = [
                 '<div class="box">',
-                'jghjgj',
+                    '<input type="text" id="search-bar-text" class="input-field form-control" maxlength="255" placeholder="'+this.textFind+'" autocomplete="off">',
+                    '<div class="tools">',
+                        '<div id="search-bar-back"></div>',
+                        '<div id="search-bar-next"></div>',
+                        '<div id="search-bar-close"></div>',
+                    '</div>',
                 '</div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
+
+            Common.NotificationCenter.on('layout:changed', _.bind(this.onLayoutChanged, this));
         },
 
         render: function() {
             Common.UI.Window.prototype.render.call(this);
 
+            this.inputSearch = this.$window.find('#search-bar-text');
 
+            this.btnBack = new Common.UI.Button({
+                parentEl: $('#search-bar-back'),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-arrow-up'
+            });
+            this.btnBack.on('click', _.bind(this.onBtnClick, this, 'back'));
+
+            this.btnNext = new Common.UI.Button({
+                parentEl: $('#search-bar-next'),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-arrow-down'
+            });
+            this.btnNext.on('click', _.bind(this.onBtnClick, this, 'next'));
+
+            this.btnClose = new Common.UI.Button({
+                parentEl: $('#search-bar-close'),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-close'
+            });
+            this.btnClose.on('click', _.bind(function () {
+                this.hide();
+            }, this))
 
             this.on('animate:before', _.bind(this.focus, this));
 
             return this;
         },
 
-        show: function(x, y) {
-            Common.UI.Window.prototype.show.call(this, x, y);
-
+        show: function() {
+            var top = $('#app-title').height() + $('#toolbar').height() + 2,
+                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32;
+            Common.UI.Window.prototype.show.call(this, left, top);
 
             this.focus();
         },
@@ -86,7 +118,8 @@ define([
         focus: function() {
             var me  = this;
             setTimeout(function(){
-
+                me.inputSearch.focus();
+                me.inputSearch.select();
             }, 10);
         },
 
@@ -96,5 +129,21 @@ define([
             };
         },
 
+        onLayoutChanged: function () {
+            var top = $('#app-title').height() + $('#toolbar').height() + 2,
+                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32;
+            this.$window.css({left: left, top: top});
+        },
+
+        onBtnClick: function(action, event) {
+            if ( $('.asc-loadmask').length ) return;
+            var opts = {
+                textsearch  : this.inputSearch.val()
+            };
+            this.fireEvent('search:'+action, [this, opts]);
+        },
+
+        textFind: 'Find'
+
     }, Common.UI.SearchBar || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 322fb7845..5f64dfa18 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -80,4 +80,22 @@
             }
         }
     }
+}
+
+.search-bar {
+    z-index: 950;
+    .box {
+        padding: 16px;
+        display: flex;
+        input[type=text] {
+            width: 192px;
+        }
+        .tools {
+            display: flex;
+            align-items: center;
+            div {
+                margin-left: 5px;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index 3e2a27386..ebe926b5c 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -158,6 +158,7 @@ require([
             'LeftMenu',
             'Main',
             'ViewTab',
+            'Search',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -187,6 +188,7 @@ require([
                 'documenteditor/main/app/controller/LeftMenu',
                 'documenteditor/main/app/controller/Main',
                 'documenteditor/main/app/controller/ViewTab',
+                'documenteditor/main/app/controller/Search',
                 'documenteditor/main/app/view/FileMenuPanels',
                 'documenteditor/main/app/view/ParagraphSettings',
                 'documenteditor/main/app/view/HeaderFooterSettings',
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index b46515549..633cdf77e 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1195,7 +1195,9 @@ define([
                     leftmenuController          = application.getController('LeftMenu'),
                     chatController              = application.getController('Common.Controllers.Chat'),
                     pluginsController           = application.getController('Common.Controllers.Plugins'),
-                    navigationController        = application.getController('Navigation');
+                    navigationController        = application.getController('Navigation'),
+                    searchController            = application.getController('Search');
+
 
                 leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document});
                 leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api);
@@ -1219,6 +1221,8 @@ define([
 
                 documentHolderController.getView().setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me));
 
+                searchController.setApi(me.api);
+
                 if (me.appOptions.isEdit) {
                     if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
                         me.appOptions.forcesave = Common.localStorage.getBool("de-settings-forcesave", me.appOptions.canForcesave);
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
new file mode 100644
index 000000000..6026abd34
--- /dev/null
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -0,0 +1,87 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ViewTab.js
+ *
+ *  Created by Julia Svinareva on 09.02.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'core'
+], function () {
+    'use strict';
+
+    DE.Controllers.Search = Backbone.Controller.extend(_.extend({
+        sdkViewName : '#id_main',
+
+        initialize: function () {
+            console.log('init');
+            this.addListeners({
+                'SearchBar': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                }
+            });
+        },
+        onLaunch: function () {
+            this._state = {};
+        },
+
+        setApi: function (api) {
+            if (api) {
+                this.api = api;
+            }
+            return this;
+        },
+
+        onQuerySearch: function (d, w, opts) {
+            if (opts.textsearch && opts.textsearch.length) {
+                if (!this.api.asc_findText(opts.textsearch, d != 'back')) {
+                    var me = this;
+                    Common.UI.info({
+                        msg: this.textNoTextFound,
+                        callback: function() {
+                            //me.dlgSearch.focus();
+                        }
+                    });
+                }
+            }
+        },
+
+        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
+
+    }, DE.Controllers.Search || {}));
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index ec93ef631..b261e8b6b 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -463,15 +463,21 @@ define([
         },
 
         onSearchClick: function () {
-            if ( !this.searchBar ) {
-                this.searchBar = (new Common.UI.SearchBar({
-                }));
+            if (!this.searchBar) {
+                this.searchBar = new Common.UI.SearchBar({});
             }
-
-            var top = $('#app-title').height() + $('#toolbar').height() + 2,
-                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.searchBar.options.width - 32;
-
-            this.searchBar.show(left, top);
+            if (this.header.btnSearch.pressed) {
+                if (this.searchBar.isVisible()) {
+                    this.searchBar.focus();
+                } else {
+                    this.searchBar.show();
+                }
+            } else {
+                this.searchBar.hide();
+            }
+            this.searchBar.on('hide', _.bind(function () {
+                this.header.btnSearch.toggle(false);
+            }, this));
         },
 
         textFitPage: 'Fit to Page',
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index cb8cdd5a4..1463eec8b 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -148,6 +148,7 @@ require([
             'LeftMenu',
             'Main',
             'ViewTab',
+            'Search',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -177,6 +178,7 @@ require([
                 'documenteditor/main/app/controller/LeftMenu',
                 'documenteditor/main/app/controller/Main',
                 'documenteditor/main/app/controller/ViewTab',
+                'documenteditor/main/app/controller/Search',
                 'documenteditor/main/app/view/FileMenuPanels',
                 'documenteditor/main/app/view/ParagraphSettings',
                 'documenteditor/main/app/view/HeaderFooterSettings',

From 9336d891d7ebe96e732aba1d7c3512c228c48eca Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Sat, 12 Feb 2022 15:35:16 +0300
Subject: [PATCH 03/52] [DE] Make new search, add left panel

---
 .../main/lib/template/SearchPanel.template    |  8 ++
 apps/common/main/lib/view/SearchBar.js        | 12 +++
 apps/common/main/lib/view/SearchPanel.js      | 96 +++++++++++++++++++
 .../main/resources/less/searchdialog.less     | 27 ++++++
 .../main/app/controller/LeftMenu.js           |  5 +
 .../main/app/controller/Search.js             | 14 ++-
 .../main/app/template/LeftMenu.template       |  2 +
 apps/documenteditor/main/app/view/LeftMenu.js | 28 +++++-
 8 files changed, 190 insertions(+), 2 deletions(-)
 create mode 100644 apps/common/main/lib/template/SearchPanel.template
 create mode 100644 apps/common/main/lib/view/SearchPanel.js

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
new file mode 100644
index 000000000..808667fbe
--- /dev/null
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -0,0 +1,8 @@
+<div id="search-box" class="layout-ct vbox">
+    <div id="search-header">
+        <label><%= scope.textFind %></label>
+        <div id="search-btn-close"></div>
+    </div>
+    <div id="search-results">
+    </div>
+</div>
\ No newline at end of file
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index b2605d287..acb2e9252 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -62,6 +62,7 @@ define([
                     '<div class="tools">',
                         '<div id="search-bar-back"></div>',
                         '<div id="search-bar-next"></div>',
+                        '<div id="search-bar-open-panel"></div>',
                         '<div id="search-bar-close"></div>',
                     '</div>',
                 '</div>'
@@ -93,6 +94,13 @@ define([
             });
             this.btnNext.on('click', _.bind(this.onBtnClick, this, 'next'));
 
+            this.btnOpenPanel = new Common.UI.Button({
+                parentEl: $('#search-bar-open-panel'),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon more-vertical'
+            });
+            this.btnOpenPanel.on('click', _.bind(this.onOpenPanel, this));
+
             this.btnClose = new Common.UI.Button({
                 parentEl: $('#search-bar-close'),
                 cls: 'btn-toolbar',
@@ -143,6 +151,10 @@ define([
             this.fireEvent('search:'+action, [this, opts]);
         },
 
+        onOpenPanel: function () {
+
+        },
+
         textFind: 'Find'
 
     }, Common.UI.SearchBar || {}));
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
new file mode 100644
index 000000000..7d23f33f6
--- /dev/null
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -0,0 +1,96 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ * User: Julia.Svinareva
+ * Date: 11.02.2022
+ */
+
+define([
+    'text!common/main/lib/template/SearchPanel.template',
+    'common/main/lib/util/utils',
+    'common/main/lib/component/BaseView',
+    'common/main/lib/component/Layout'
+], function (template) {
+    'use strict';
+
+    Common.Views.SearchPanel = Common.UI.BaseView.extend(_.extend({
+        el: '#left-panel-search',
+        template: _.template(template),
+
+        initialize: function(options) {
+            _.extend(this, options);
+            Common.UI.BaseView.prototype.initialize.call(this, arguments);
+        },
+
+        render: function(el) {
+            if (!this.rendered) {
+                el = el || this.el;
+                $(el).html(this.template({scope: this}));
+                this.$el = $(el);
+
+                this.buttonClose = new Common.UI.Button({
+                    parentEl: $('#search-btn-close', this.$el),
+                    cls: 'btn-toolbar',
+                    iconCls: 'toolbar__icon btn-close',
+                    hint: this.textCloseSearch
+                });
+                this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
+            }
+
+            this.rendered = true;
+            this.trigger('render:after', this);
+            return this;
+        },
+
+        show: function () {
+            Common.UI.BaseView.prototype.show.call(this,arguments);
+            this.fireEvent('show', this );
+        },
+
+        hide: function () {
+            Common.UI.BaseView.prototype.hide.call(this,arguments);
+            this.fireEvent('hide', this );
+        },
+
+        ChangeSettings: function(props) {
+        },
+
+        onClickClosePanel: function() {
+            Common.NotificationCenter.trigger('leftmenu:change', 'hide');
+        },
+
+        textFind: 'Find',
+        textCloseSearch: 'Close search'
+
+    }, Common.Views.SearchPanel || {}));
+});
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 5f64dfa18..1430a4aee 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -95,7 +95,34 @@
             align-items: center;
             div {
                 margin-left: 5px;
+                &:first-of-type {
+                    margin-left: 7px;
+                }
             }
         }
     }
+}
+
+#search-box {
+    position: relative;
+    border-collapse: collapse;
+
+    #search-header {
+        position: relative;
+        height: 45px;
+        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 {
+            font-size: 12px;
+            .font-weight-bold();
+            margin-top: 2px;
+        }
+
+        #search-btn-close {
+            float: right;
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 270215f25..53c704c04 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -192,6 +192,8 @@ define([
         },
 
         createDelayedElements: function() {
+            this.leftMenu.setOptionsPanel('searchbar', this.getApplication().getController('Search').getView('Common.Views.SearchPanel'));
+
             /** coauthoring begin **/
             if ( this.mode.canCoAuthoring ) {
                 this.leftMenu.btnComments[(this.mode.canViewComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
@@ -776,6 +778,9 @@ define([
                     } else if (this.leftMenu.btnThumbnails.isActive()) {
                         this.leftMenu.btnThumbnails.toggle(false);
                         this.leftMenu.onBtnMenuClick(this.leftMenu.btnThumbnails);
+                    } else if (this.leftMenu.btnSearchBar.isActive()) {
+                        this.leftMenu.btnSearchBar.toggle(false);
+                        this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
                     }
                 }
             }
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 6026abd34..0fe0ac009 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -40,13 +40,18 @@
  */
 
 define([
-    'core'
+    'core',
+    'common/main/lib/view/SearchPanel'
 ], function () {
     'use strict';
 
     DE.Controllers.Search = Backbone.Controller.extend(_.extend({
         sdkViewName : '#id_main',
 
+        views: [
+            'Common.Views.SearchPanel'
+        ],
+
         initialize: function () {
             console.log('init');
             this.addListeners({
@@ -58,6 +63,8 @@ define([
         },
         onLaunch: function () {
             this._state = {};
+
+            this.view = this.createView('Common.Views.SearchPanel');
         },
 
         setApi: function (api) {
@@ -67,6 +74,11 @@ define([
             return this;
         },
 
+        getView: function(name) {
+            return !name && this.view ?
+                this.view : Backbone.Controller.prototype.getView.call(this, name);
+        },
+
         onQuerySearch: function (d, w, opts) {
             if (opts.textsearch && opts.textsearch.length) {
                 if (!this.api.asc_findText(opts.textsearch, d != 'back')) {
diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template
index 27eef5966..f1b280f03 100644
--- a/apps/documenteditor/main/app/template/LeftMenu.template
+++ b/apps/documenteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,7 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
         <button id="left-btn-search" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
@@ -12,6 +13,7 @@
         <button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>
     <div class="left-panel" style="">
+        <div id="left-panel-search" class="" style="display: none;"></div>
         <!-- /** coauthoring begin **/ -->
         <div id="left-panel-comments" class="" style="display: none;"></div>
         <div id="left-panel-chat" class="" style="display: none;"></div>
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 69ef3d49f..7673a3f4b 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -76,6 +76,7 @@ define([
                 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-navigation': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-thumbnails': _.bind(this.onCoauthOptions, this),
+                'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-support': function() {
                     var config = this.mode.customization;
                     config && !!config.feedback && !!config.feedback.url ?
@@ -101,6 +102,15 @@ define([
                 enableToggle: true
             });
 
+            this.btnSearchBar = new Common.UI.Button({
+                action: 'searchbar',
+                el: $markup.elementById('#left-btn-searchbar'),
+                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                disabled: true,
+                enableToggle: true,
+                toggleGroup: 'leftMenuGroup'
+            });
+
             this.btnAbout = new Common.UI.Button({
                 action: 'about',
                 el: $markup.elementById('#left-btn-about'),
@@ -162,6 +172,7 @@ define([
             this.btnNavigation.on('click',         this.onBtnMenuClick.bind(this));
 
             this.btnSearch.on('click',          this.onBtnMenuClick.bind(this));
+            this.btnSearchBar.on('click',       this.onBtnMenuClick.bind(this));
             this.btnAbout.on('toggle',          this.onBtnMenuToggle.bind(this));
 
             this.menuFile = new DE.Views.FileMenu();
@@ -257,6 +268,13 @@ define([
                     this.panelThumbnails.hide();
                 }
             }
+            if (this.panelSearch) {
+                if (this.btnSearchBar.pressed) {
+                    this.panelSearch.show();
+                } else {
+                    this.panelSearch.hide();
+                }
+            }
             /** coauthoring end **/
             // if (this.mode.canPlugins && this.panelPlugins) {
             //     if (this.btnPlugins.pressed) {
@@ -285,6 +303,9 @@ define([
             if (name == 'thumbnails') {
                 this.panelThumbnails = panel.render('#left-panel-thumbnails');
             }
+            if (name == 'searchbar') {
+                this.panelSearch = panel.render('#left-panel-search');
+            }
         },
 
         /** coauthoring begin **/
@@ -329,11 +350,15 @@ define([
                     this.panelNavigation['hide']();
                     this.btnNavigation.toggle(false, true);
                 }
+                if (this.panelSearch) {
+                    this.panelSearch['hide']();
+                    this.btnSearchBar.toggle(false, true);
+                }
             }
         },
 
         isOpened: function() {
-            var isopened = this.btnSearch.pressed;
+            var isopened = this.btnSearchBar.pressed;
             /** coauthoring begin **/
             !isopened && (isopened = this.btnComments.pressed || this.btnChat.pressed);
             /** coauthoring end **/
@@ -342,6 +367,7 @@ define([
 
         disableMenu: function(menu, disable) {
             this.btnSearch.setDisabled(false);
+            this.btnSearchBar.setDisabled(false);
             this.btnAbout.setDisabled(false);
             this.btnSupport.setDisabled(false);
             /** coauthoring begin **/

From c44fdfc61eee80cba1338572d5c43c0cc53e9168 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Sat, 12 Feb 2022 15:36:32 +0300
Subject: [PATCH 04/52] Add icons for new search

---
 .../resources/img/toolbar/1.25x/more-vertical.png | Bin 0 -> 107 bytes
 .../resources/img/toolbar/1.5x/more-vertical.png  | Bin 0 -> 134 bytes
 .../resources/img/toolbar/1.75x/more-vertical.png | Bin 0 -> 140 bytes
 .../resources/img/toolbar/1x/more-vertical.png    | Bin 0 -> 104 bytes
 .../resources/img/toolbar/2x/more-vertical.png    | Bin 0 -> 172 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/common/main/resources/img/toolbar/1.25x/more-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.5x/more-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1.75x/more-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/1x/more-vertical.png
 create mode 100644 apps/common/main/resources/img/toolbar/2x/more-vertical.png

diff --git a/apps/common/main/resources/img/toolbar/1.25x/more-vertical.png b/apps/common/main/resources/img/toolbar/1.25x/more-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..2abea9e3f3382c17fa86882f54a837df1cf8670a
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy?>0-i38Ar-gYUOvdlV8Fw?@y-4e
zw?dARCMSDWCjJM<LmB_9IX}<ylC`_To4$q{NBIuSWn_3|aa8H!(m6og44$rjF6*2U
FngI0;BAEaH

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.5x/more-vertical.png b/apps/common/main/resources/img/toolbar/1.5x/more-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..44d1c6f79d5742c46677cda2b2de0e5038c00ee8
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4LuvDPK<)$B>F!Z?70~9WdZwar}Sh
z*H2Y}#7|73CwVxohgV!@YVg1Ded&Ee&oa5{s)9Ik%O5l3Vr;jyv4_9cozD{zwKP-;
gL_{rRe88{geWI%E+5GBLK!X`PUHx3vIVCg!0HLrhLI3~&

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1.75x/more-vertical.png b/apps/common/main/resources/img/toolbar/1.75x/more-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9158bfc49390363307eae4d2fa135a1327896df
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRIsOuV@SoVw^tpx8Vq<`58kuc
zSt-Kf8pC}yiOuP|{HbVe1_rxF`(Axtv8t=;NK4|Y(&g<p)p#b`dhto9RZssik#Xm=
hY#?HQQVeyaj9+7_+QN6fO9L9u;OXk;vd$@?2>^AOFu(u+

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/1x/more-vertical.png b/apps/common/main/resources/img/toolbar/1x/more-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..07d127a2548e900cb9e8b624464234c653599902
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<!3HG%yVdUoQu>}Qjv*Dd-d@_s$>6}lyz$Nc
z6t}{PAA*-$nZE0-<BGUguRZC@?Ul_L0nJiZ6l6>*|63egawTvkP%DF{tDnm{r-UW|
D^Y9|W

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/img/toolbar/2x/more-vertical.png b/apps/common/main/resources/img/toolbar/2x/more-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2338321dbe00ef6d37ed04eaf427aa68c808efc
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!3HEV6KWZORI#UvV@SoVx7QAGGAQ!6I$B>n
zr>m&CLvYgu)s#dwrg`#m|0ICQ>dihY<zL@DwfNkb?me~lWts04EZ37_+w(B)qG3V}
z)4Mjt$HE2WJUg^vuI!FJ5W4?ETMRRU^##5y%x@j61&~+_3-+=f3cWq|R^O~zpt%g5
Lu6{1-oD!M<%*#8X

literal 0
HcmV?d00001


From e7b1f74f578d3a9f6653ab0bcc78af75be99ca75 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 14 Feb 2022 19:16:04 +0300
Subject: [PATCH 05/52] [DE] New search: make show search panel from search
 window

---
 .../main/lib/template/SearchPanel.template      |  2 +-
 apps/common/main/lib/view/SearchBar.js          |  3 ++-
 apps/common/main/lib/view/SearchPanel.js        |  8 +++++++-
 .../main/app/controller/LeftMenu.js             | 17 +++++++++++++++--
 .../main/app/controller/Search.js               |  4 +++-
 apps/documenteditor/main/app/view/LeftMenu.js   | 11 +++++++++--
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 808667fbe..079887f33 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -1,6 +1,6 @@
 <div id="search-box" class="layout-ct vbox">
     <div id="search-header">
-        <label><%= scope.textFind %></label>
+        <label><%= headerText %></label>
         <div id="search-btn-close"></div>
     </div>
     <div id="search-results">
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index acb2e9252..f7b9c3e0d 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -152,7 +152,8 @@ define([
         },
 
         onOpenPanel: function () {
-
+            this.hide();
+            this.fireEvent('search:show', [true]);
         },
 
         textFind: 'Find'
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 7d23f33f6..864d155b2 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -50,12 +50,17 @@ define([
         initialize: function(options) {
             _.extend(this, options);
             Common.UI.BaseView.prototype.initialize.call(this, arguments);
+
+            this.isEdit = options.mode.isEdit;
         },
 
         render: function(el) {
             if (!this.rendered) {
                 el = el || this.el;
-                $(el).html(this.template({scope: this}));
+                $(el).html(this.template({
+                    scope: this,
+                    headerText: this.isEdit ? this.textFindAndReplace : this.textFind
+                }));
                 this.$el = $(el);
 
                 this.buttonClose = new Common.UI.Button({
@@ -90,6 +95,7 @@ define([
         },
 
         textFind: 'Find',
+        textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search'
 
     }, Common.Views.SearchPanel || {}));
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 53c704c04..67ac025c4 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -110,6 +110,9 @@ define([
                 },
                 'ViewTab': {
                     'viewtab:navigation': _.bind(this.onShowHideNavigation, this)
+                },
+                'SearchBar': {
+                    'search:show': _.bind(this.onShowHideSearch, this)
                 }
             });
 
@@ -172,6 +175,8 @@ define([
             if (this.mode.canUseHistory)
                 this.getApplication().getController('Common.Controllers.History').setApi(this.api).setMode(this.mode);
             this.getApplication().getController('PageThumbnails').setApi(this.api).setMode(this.mode);
+            this.getApplication().getController('Search').setApi(this.api).setMode(this.mode);
+            this.leftMenu.setOptionsPanel('advancedsearch', this.getApplication().getController('Search').getView('Common.Views.SearchPanel'));
             return this;
         },
 
@@ -192,8 +197,6 @@ define([
         },
 
         createDelayedElements: function() {
-            this.leftMenu.setOptionsPanel('searchbar', this.getApplication().getController('Search').getView('Common.Views.SearchPanel'));
-
             /** coauthoring begin **/
             if ( this.mode.canCoAuthoring ) {
                 this.leftMenu.btnComments[(this.mode.canViewComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
@@ -915,6 +918,16 @@ define([
             }
         },
 
+        onShowHideSearch: function (state) {
+            if (state) {
+                Common.UI.Menu.Manager.hideAll();
+                this.leftMenu.showMenu('advancedsearch');
+            } else {
+                this.leftMenu.btnSearchBar.toggle(false, true);
+                this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
+            }
+        },
+
         isCommentsVisible: function() {
             return this.leftMenu && this.leftMenu.panelComments && this.leftMenu.panelComments.isVisible();
         },
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 0fe0ac009..a53fb2ad5 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -63,8 +63,10 @@ define([
         },
         onLaunch: function () {
             this._state = {};
+        },
 
-            this.view = this.createView('Common.Views.SearchPanel');
+        setMode: function (mode) {
+            this.view = this.createView('Common.Views.SearchPanel', { mode: mode });
         },
 
         setApi: function (api) {
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 7673a3f4b..0f62363aa 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -103,7 +103,7 @@ define([
             });
 
             this.btnSearchBar = new Common.UI.Button({
-                action: 'searchbar',
+                action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
                 hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
                 disabled: true,
@@ -303,7 +303,7 @@ define([
             if (name == 'thumbnails') {
                 this.panelThumbnails = panel.render('#left-panel-thumbnails');
             }
-            if (name == 'searchbar') {
+            if (name == 'advancedsearch') {
                 this.panelSearch = panel.render('#left-panel-search');
             }
         },
@@ -411,6 +411,13 @@ define([
                         this.onBtnMenuClick(this.btnNavigation);
                         this.onCoauthOptions();
                     }
+                } else if (menu == 'advancedsearch') {
+                    if (this.btnSearchBar.isVisible() &&
+                        !this.btnSearchBar.isDisabled() && !this.btnSearchBar.pressed) {
+                        this.btnSearchBar.toggle(true);
+                        this.onBtnMenuClick(this.btnSearchBar);
+                        this.onCoauthOptions();
+                    }
                 }
                 /** coauthoring end **/
             }

From ab5241d11a38954121b69b43a4c196f112f86d0d Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 16 Feb 2022 21:48:45 +0300
Subject: [PATCH 06/52] [DE] New search: add settings into search panel

---
 .../main/lib/template/SearchPanel.template    | 37 +++++++++-
 apps/common/main/lib/view/SearchPanel.js      | 70 ++++++++++++++++++-
 .../main/resources/less/searchdialog.less     | 23 +++++-
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 079887f33..75b4bb0f6 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -1,8 +1,43 @@
-<div id="search-box" class="layout-ct vbox">
+<div id="search-box" class="layout-ct vbox search-panel">
     <div id="search-header">
         <label><%= headerText %></label>
         <div id="search-btn-close"></div>
     </div>
+    <div id="search-adv-settings">
+        <table cols="1">
+            <tbody>
+                <tr>
+                    <td class="padding-small"><div id="search-adv-text"></div></td>
+                </tr>
+                <tr>
+                    <td class="padding-large"><div id="search-adv-replace-text"></div></td>
+                </tr>
+                <tr>
+                    <td class="padding-large">
+                        <label id="search-adv-results-number" style="display: inline-block;">
+                            <%= scope.textSearchResults %>
+                        </label>
+                        <div class="search-nav-btns" style="display: inline-block; float: right;">
+                            <div id="search-adv-back" style="display: inline-block; margin-right: 4px;"></div>
+                            <div id="search-adv-next" style="display: inline-block;"></div>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="padding-large">
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace" style="display: inline-block; min-width: 62px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="padding-small"><div id="search-adv-case-sensitive"></div></td>
+                </tr>
+                <tr>
+                    <td class="padding-small"><div id="search-adv-use-regexp"></div></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
     <div id="search-results">
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 864d155b2..544c31948 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -63,6 +63,64 @@ define([
                 }));
                 this.$el = $(el);
 
+                this.inputText = new Common.UI.InputField({
+                    el: $('#search-adv-text'),
+                    placeHolder: this.textFind,
+                    allowBlank: true,
+                    validateOnBlur: false,
+                    style: 'width: 100%;'
+                });
+
+                this.inputReplace = new Common.UI.InputField({
+                    el: $('#search-adv-replace-text'),
+                    placeHolder: this.textReplaceWith,
+                    allowBlank: true,
+                    validateOnBlur: false,
+                    style: 'width: 100%;'
+                });
+
+                this.$reaultsNumber = $('#search-adv-results-number');
+
+                this.btnBack = new Common.UI.Button({
+                    parentEl: $('#search-adv-back'),
+                    cls: 'btn-toolbar',
+                    iconCls: 'toolbar__icon btn-arrow-up',
+                    dataHint: '1',
+                    dataHintDirection: 'bottom'
+                });
+
+                this.btnNext = new Common.UI.Button({
+                    parentEl: $('#search-adv-next'),
+                    cls: 'btn-toolbar',
+                    iconCls: 'toolbar__icon btn-arrow-down',
+                    dataHint: '1',
+                    dataHintDirection: 'bottom'
+                });
+
+                this.btnReplace = new Common.UI.Button({
+                    el: $('#search-adv-replace')
+                });
+
+                this.btnReplaceAll = new Common.UI.Button({
+                    el: $('#search-adv-replace-all')
+                });
+
+                this.chCaseSensitive = new Common.UI.CheckBox({
+                    el: $('#search-adv-case-sensitive'),
+                    labelText: this.textCaseSensitive,
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
+                });
+
+                this.chUseRegExp = new Common.UI.CheckBox({
+                    el: $('#search-adv-use-regexp'),
+                    labelText: this.textMatchUsingRegExp,
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
+                });
+
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -90,13 +148,23 @@ define([
         ChangeSettings: function(props) {
         },
 
+        updateResultsNumber: function (current, count) {
+            this.$reaultsNumber.text(Common.Utils.String.format(current, count));
+        },
+
         onClickClosePanel: function() {
             Common.NotificationCenter.trigger('leftmenu:change', 'hide');
         },
 
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
-        textCloseSearch: 'Close search'
+        textCloseSearch: 'Close search',
+        textReplace: 'Replace',
+        textReplaceAll: 'Replace All',
+        textSearchResults: 'Search results: {0}/{1}',
+        textReplaceWith: 'Replace with',
+        textCaseSensitive: 'Case sensitive',
+        textMatchUsingRegExp: 'Match using regular expressions'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 1430a4aee..75395c1d1 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -103,9 +103,10 @@
     }
 }
 
-#search-box {
+.search-panel {
     position: relative;
     border-collapse: collapse;
+    line-height: 15px;
 
     #search-header {
         position: relative;
@@ -125,4 +126,24 @@
             float: right;
         }
     }
+
+    #search-adv-settings {
+        padding: 10px 15px 0 15px;
+
+        table {
+            width: 100%;
+        }
+
+        .padding-small {
+            padding-bottom: 8px;
+        }
+
+        .padding-large {
+            padding-bottom: 14px;
+        }
+
+        #search-adv-results-number {
+            padding-top: 2px;
+        }
+    }
 }
\ No newline at end of file

From 2bf17f6f5a16ba709783e81dce63a70d55dfd7b5 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 21 Feb 2022 17:22:12 +0300
Subject: [PATCH 07/52] [DE] New search: add methods in controller

---
 .../main/lib/template/SearchPanel.template    |  3 ++
 apps/common/main/lib/view/SearchBar.js        |  1 +
 apps/common/main/lib/view/SearchPanel.js      | 35 ++++++++++++++++++-
 .../main/app/controller/Search.js             | 28 ++++++++++++++-
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 75b4bb0f6..449c7fcbc 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -35,6 +35,9 @@
                 <tr>
                     <td class="padding-small"><div id="search-adv-use-regexp"></div></td>
                 </tr>
+                <tr>
+                    <td class="padding-small"><div id="search-adv-match-word"></div></td>
+                </tr>
             </tbody>
         </table>
     </div>
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index f7b9c3e0d..0ea7c17f9 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -73,6 +73,7 @@ define([
             Common.UI.Window.prototype.initialize.call(this, this.options);
 
             Common.NotificationCenter.on('layout:changed', _.bind(this.onLayoutChanged, this));
+            $(window).on('resize', _.bind(this.onLayoutChanged, this));
         },
 
         render: function() {
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 544c31948..e22a774e4 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -88,6 +88,7 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
+                this.btnBack.on('click', _.bind(this.onBtnClick, this, 'next'));
 
                 this.btnNext = new Common.UI.Button({
                     parentEl: $('#search-adv-next'),
@@ -96,14 +97,17 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
+                this.btnNext.on('click', _.bind(this.onBtnClick, this, 'next'));
 
                 this.btnReplace = new Common.UI.Button({
                     el: $('#search-adv-replace')
                 });
+                this.btnReplace.on('click', _.bind(this.onBtnClick, this, 'replace'));
 
                 this.btnReplaceAll = new Common.UI.Button({
                     el: $('#search-adv-replace-all')
                 });
+                this.btnReplaceAll.on('click', _.bind(this.onBtnClick, this, 'replaceall'));
 
                 this.chCaseSensitive = new Common.UI.CheckBox({
                     el: $('#search-adv-case-sensitive'),
@@ -121,6 +125,14 @@ define([
                     dataHintOffset: 'small'
                 });
 
+                this.chMatchWord = new Common.UI.CheckBox({
+                    el: $('#search-adv-match-word'),
+                    labelText: this.options.matchwordstr || this.textWholeWords,
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
+                });
+
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -145,6 +157,14 @@ define([
             this.fireEvent('hide', this );
         },
 
+        focus: function() {
+            var me  = this;
+            setTimeout(function(){
+                me.inputText.$el.find('input').focus();
+                me.inputText.$el.find('input').select();
+            }, 10);
+        },
+
         ChangeSettings: function(props) {
         },
 
@@ -156,6 +176,18 @@ define([
             Common.NotificationCenter.trigger('leftmenu:change', 'hide');
         },
 
+        onBtnClick: function(action) {
+            var opts = {
+                textsearch  : this.inputText.getValue(),
+                textreplace : this.inputReplace.getValue(),
+                matchcase   : this.chCaseSensitive.checked,
+                useregexp   : this.chUseRegExp.checked,
+                matchword   : this.chMatchWord.checked,
+                //highlight   : this.miHighlight.checked
+            };
+            this.fireEvent('search:'+action, [this, opts]);
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
@@ -164,7 +196,8 @@ define([
         textSearchResults: 'Search results: {0}/{1}',
         textReplaceWith: 'Replace with',
         textCaseSensitive: 'Case sensitive',
-        textMatchUsingRegExp: 'Match using regular expressions'
+        textMatchUsingRegExp: 'Match using regular expressions',
+        textWholeWords: 'Whole words only',
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index a53fb2ad5..562d3cb2e 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -58,6 +58,12 @@ define([
                 'SearchBar': {
                     'search:back': _.bind(this.onQuerySearch, this, 'back'),
                     'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                },
+                'Common.Views.SearchPanel': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:replace': _.bind(this.onQueryReplace, this),
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
                 }
             });
         },
@@ -83,7 +89,7 @@ define([
 
         onQuerySearch: function (d, w, opts) {
             if (opts.textsearch && opts.textsearch.length) {
-                if (!this.api.asc_findText(opts.textsearch, d != 'back')) {
+                if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
                     var me = this;
                     Common.UI.info({
                         msg: this.textNoTextFound,
@@ -95,6 +101,26 @@ define([
             }
         },
 
+        onQueryReplace: function(w, opts) {
+            if (!_.isEmpty(opts.textsearch)) {
+                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
+                    var me = this;
+                    Common.UI.info({
+                        msg: this.textNoTextFound,
+                        callback: function() {
+                            me.view.focus();
+                        }
+                    });
+                }
+            }
+        },
+
+        onQueryReplaceAll: function(w, opts) {
+            if (!_.isEmpty(opts.textsearch)) {
+                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase, opts.matchword);
+            }
+        },
+
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
 
     }, DE.Controllers.Search || {}));

From 368f7306e4a1f490d4b5408acf70f443bd9815c8 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 22 Feb 2022 20:17:21 +0300
Subject: [PATCH 08/52] [SSE] New search: make left panel

---
 .../main/lib/template/SearchPanel.template    |  12 ++
 apps/common/main/lib/view/SearchBar.js        |   2 +-
 apps/common/main/lib/view/SearchPanel.js      |  55 +++++-
 .../main/resources/less/searchdialog.less     |   4 +
 apps/documenteditor/main/app/view/LeftMenu.js |   2 +-
 apps/spreadsheeteditor/main/app.js            |   2 +
 .../main/app/controller/LeftMenu.js           |  40 +---
 .../main/app/controller/Search.js             | 185 ++++++++++++++++++
 .../main/app/template/LeftMenu.template       |   2 +
 .../main/app/view/LeftMenu.js                 |  35 +++-
 apps/spreadsheeteditor/main/app_dev.js        |   2 +
 11 files changed, 302 insertions(+), 39 deletions(-)
 create mode 100644 apps/spreadsheeteditor/main/app/controller/Search.js

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 449c7fcbc..7d0778a40 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -29,6 +29,18 @@
                        <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
                     </td>
                 </tr>
+                <tr>
+                    <td class="padding-large">
+                        <div class="search-options">
+                            <label class="input-label"><%= scope.textWithin %></label>
+                            <div id="search-adv-cmb-within"></div>
+                            <label class="input-label"><%= scope.textSearch %></label>
+                            <div id="search-adv-cmb-search"></div>
+                            <label class="input-label"><%= scope.textLookIn %></label>
+                            <div id="search-adv-cmb-look-in"></div>
+                        </div>
+                    </td>
+                </tr>
                 <tr>
                     <td class="padding-small"><div id="search-adv-case-sensitive"></div></td>
                 </tr>
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 0ea7c17f9..716f52ed9 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -149,7 +149,7 @@ define([
             var opts = {
                 textsearch  : this.inputSearch.val()
             };
-            this.fireEvent('search:'+action, [this, opts]);
+            this.fireEvent('search:'+action, [this, opts, false]);
         },
 
         onOpenPanel: function () {
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index e22a774e4..80a428b12 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -133,6 +133,42 @@ define([
                     dataHintOffset: 'small'
                 });
 
+                this.cmbWithin = new Common.UI.ComboBox({
+                    el: $('#search-adv-cmb-within'),
+                    menuStyle: 'min-width: 100%;',
+                    style: "width: 219px;",
+                    editable: false,
+                    cls: 'input-group-nr',
+                    data: [
+                        { value: 0, displayValue: this.textSheet },
+                        { value: 1, displayValue: this.textWorkbook }
+                    ]
+                });
+
+                this.cmbSearch = new Common.UI.ComboBox({
+                    el: $('#search-adv-cmb-search'),
+                    menuStyle: 'min-width: 100%;',
+                    style: "width: 219px;",
+                    editable: false,
+                    cls: 'input-group-nr',
+                    data: [
+                        { value: 0, displayValue: this.textByRows },
+                        { value: 1, displayValue: this.textByColumns }
+                    ]
+                });
+
+                this.cmbLookIn = new Common.UI.ComboBox({
+                    el: $('#search-adv-cmb-look-in'),
+                    menuStyle: 'min-width: 100%;',
+                    style: "width: 219px;",
+                    editable: false,
+                    cls: 'input-group-nr',
+                    data: [
+                        { value: 0, displayValue: this.textFormulas },
+                        { value: 1, displayValue: this.textValues }
+                    ]
+                });
+
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -185,7 +221,15 @@ define([
                 matchword   : this.chMatchWord.checked,
                 //highlight   : this.miHighlight.checked
             };
-            this.fireEvent('search:'+action, [this, opts]);
+            this.fireEvent('search:'+action, [this, opts, true]);
+        },
+
+        getSettings: function() {
+            return {
+                textsearch: this.inputText.getValue(),
+                matchcase: this.chCaseSensitive.checked,
+                matchword: this.chMatchWord.checked
+            };
         },
 
         textFind: 'Find',
@@ -198,6 +242,15 @@ define([
         textCaseSensitive: 'Case sensitive',
         textMatchUsingRegExp: 'Match using regular expressions',
         textWholeWords: 'Whole words only',
+        textWithin: 'Within',
+        textSearch: 'Search',
+        textLookIn: 'Look in',
+        textSheet: 'Sheet',
+        textWorkbook: 'Workbook',
+        textByRows: 'By rows',
+        textByColumns: 'By columns',
+        textFormulas: 'Formulas',
+        textValues: 'Values',
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 75395c1d1..7c15eb31a 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -146,4 +146,8 @@
             padding-top: 2px;
         }
     }
+
+    .search-options {
+        display: none;
+    }
 }
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 0f62363aa..3499cb27b 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -302,7 +302,7 @@ define([
             } else
             if (name == 'thumbnails') {
                 this.panelThumbnails = panel.render('#left-panel-thumbnails');
-            }
+            } else
             if (name == 'advancedsearch') {
                 this.panelSearch = panel.render('#left-panel-search');
             }
diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js
index 74d763024..e489491ff 100644
--- a/apps/spreadsheeteditor/main/app.js
+++ b/apps/spreadsheeteditor/main/app.js
@@ -159,6 +159,7 @@ require([
             'PivotTable',
             'DataTab',
             'ViewTab',
+            'Search',
             'WBProtection',
             'Common.Controllers.Fonts',
             'Common.Controllers.History',
@@ -185,6 +186,7 @@ require([
             'spreadsheeteditor/main/app/controller/PivotTable',
             'spreadsheeteditor/main/app/controller/DataTab',
             'spreadsheeteditor/main/app/controller/ViewTab',
+            'spreadsheeteditor/main/app/controller/Search',
             'spreadsheeteditor/main/app/controller/WBProtection',
             'spreadsheeteditor/main/app/view/FileMenuPanels',
             'spreadsheeteditor/main/app/view/ParagraphSettings',
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 40139a084..0df79e991 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -150,7 +150,6 @@ define([
 
         setApi: function(api) {
             this.api = api;
-            this.api.asc_registerCallback('asc_onRenameCellTextEnd',    _.bind(this.onRenameText, this));
             this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
             Common.NotificationCenter.on('api:disconnect',              _.bind(this.onApiServerDisconnect, this));
             this.api.asc_registerCallback('asc_onDownloadUrl',          _.bind(this.onDownloadUrl, this));
@@ -182,6 +181,8 @@ define([
             this.leftMenu.getMenu('file').setApi(api);
             if (this.mode.canUseHistory)
                 this.getApplication().getController('Common.Controllers.History').setApi(this.api).setMode(this.mode);
+            this.getApplication().getController('Search').setApi(this.api).setMode(this.mode);
+            this.leftMenu.setOptionsPanel('advancedsearch', this.getApplication().getController('Search').getView('Common.Views.SearchPanel'));
             return this;
         },
 
@@ -713,38 +714,6 @@ define([
             this.api.asc_enableKeyEvents(true);
         },
 
-        onRenameText: function(found, replaced) {
-            var me = this;
-            if (this.api.isReplaceAll) {
-                Common.UI.info({
-                    msg: (found) ? ((!found-replaced) ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced)) : this.textNoTextFound,
-                    callback: function() {
-                        me.dlgSearch.focus();
-                    }
-                });
-            } else {
-                var sett = this.dlgSearch.getSettings();
-                var options = this.dlgSearch.findOptions;
-                options.asc_setFindWhat(sett.textsearch);
-                options.asc_setScanForward(true);
-                options.asc_setIsMatchCase(sett.matchcase);
-                options.asc_setIsWholeCell(sett.matchword);
-                options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-                options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-                options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
-
-
-                if (!me.api.asc_findText(options)) {
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            }
-        },
-
         setPreviewMode: function(mode) {
             if (this.viewmode === mode) return;
             this.viewmode = mode;
@@ -1016,6 +985,9 @@ define([
 
                     // focus to sdk
                     this.api.asc_enableKeyEvents(true);
+                } else if (this.leftMenu.btnSearchBar.isActive() && this.api) {
+                    this.leftMenu.btnSearchBar.toggle(false);
+                    this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
                 }
             }
         },
@@ -1039,8 +1011,6 @@ define([
         newDocumentTitle        : 'Unnamed document',
         textItemEntireCell      : 'Entire cell contents',
         requestEditRightsText   : 'Requesting editing rights...',
-        textReplaceSuccess      : 'Search has been done. {0} occurrences have been replaced',
-        textReplaceSkipped      : 'The replacement has been made. {0} occurrences were skipped.',
         warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?' ,
         textWarning: 'Warning',
         textSheet: 'Sheet',
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
new file mode 100644
index 000000000..d9d33bbb2
--- /dev/null
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -0,0 +1,185 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ViewTab.js
+ *
+ *  Created by Julia Svinareva on 22.02.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'core',
+    'common/main/lib/view/SearchPanel'
+], function () {
+    'use strict';
+
+    SSE.Controllers.Search = Backbone.Controller.extend(_.extend({
+        sdkViewName : '#id_main',
+
+        views: [
+            'Common.Views.SearchPanel'
+        ],
+
+        initialize: function () {
+            console.log('init');
+            this.addListeners({
+                'SearchBar': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                },
+                'Common.Views.SearchPanel': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:replace': _.bind(this.onQueryReplace, this),
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
+                }
+            });
+        },
+        onLaunch: function () {
+            this._state = {};
+        },
+
+        setMode: function (mode) {
+            this.view = this.createView('Common.Views.SearchPanel', { mode: mode });
+        },
+
+        setApi: function (api) {
+            if (api) {
+                this.api = api;
+                this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onRenameText, this));
+            }
+            return this;
+        },
+
+        getView: function(name) {
+            return !name && this.view ?
+                this.view : Backbone.Controller.prototype.getView.call(this, name);
+        },
+
+        onQuerySearch: function (d, w, opts, fromPanel) {
+            var options = new Asc.asc_CFindOptions();
+            options.asc_setFindWhat(opts.textsearch);
+            options.asc_setScanForward(d != 'back');
+            options.asc_setIsMatchCase(opts.matchcase);
+            options.asc_setIsWholeCell(opts.matchword);
+            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
+            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
+            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+
+            if (!this.api.asc_findText(options)) {
+                var me = this;
+                Common.UI.info({
+                    msg: this.textNoTextFound,
+                    callback: function() {
+                        if (fromPanel) {
+                            me.view.focus();
+                        } else {
+
+                        }
+                    }
+                });
+            }
+        },
+
+        onQueryReplace: function(w, opts) {
+            this.api.isReplaceAll = false;
+
+            var options = new Asc.asc_CFindOptions();
+            options.asc_setFindWhat(opts.textsearch);
+            options.asc_setReplaceWith(opts.textreplace);
+            options.asc_setIsMatchCase(opts.matchcase);
+            options.asc_setIsWholeCell(opts.matchword);
+            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
+            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
+            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+            options.asc_setIsReplaceAll(false);
+
+            this.api.asc_replaceText(options);
+        },
+
+        onQueryReplaceAll: function(w, opts) {
+            this.api.isReplaceAll = true;
+
+            var options = new Asc.asc_CFindOptions();
+            options.asc_setFindWhat(opts.textsearch);
+            options.asc_setReplaceWith(opts.textreplace);
+            options.asc_setIsMatchCase(opts.matchcase);
+            options.asc_setIsWholeCell(opts.matchword);
+            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
+            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
+            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+            options.asc_setIsReplaceAll(true);
+
+            this.api.asc_replaceText(options);
+        },
+
+        onRenameText: function (found, replaced) {
+            var me = this;
+            if (this.api.isReplaceAll) {
+                Common.UI.info({
+                    msg: (found) ? ((!found-replaced) ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced)) : this.textNoTextFound,
+                    callback: function() {
+                        me.view.focus();
+                    }
+                });
+            } else {
+                var sett = this.view.getSettings();
+                var options = new Asc.asc_CFindOptions();
+                options.asc_setFindWhat(sett.textsearch);
+                options.asc_setScanForward(true);
+                options.asc_setIsMatchCase(sett.matchcase);
+                options.asc_setIsWholeCell(sett.matchword);
+                //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
+                //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
+                //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+
+
+                if (!me.api.asc_findText(options)) {
+                    Common.UI.info({
+                        msg: this.textNoTextFound,
+                        callback: function() {
+                            me.view.focus();
+                        }
+                    });
+                }
+            }
+        },
+
+        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
+        textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
+        textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',
+
+    }, SSE.Controllers.Search || {}));
+});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
index 303051908..b9c3925ce 100644
--- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,7 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
         <button id="left-btn-search" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
@@ -11,6 +12,7 @@
         <button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>
     <div class="left-panel" style="">
+        <div id="left-panel-search" class="" style="display: none;"></div>
         <!-- /** coauthoring begin **/ -->
         <div id="left-panel-comments" class="" style="display: none;"></div>
         <div id="left-panel-chat" class="" style="display: none;"></div>
diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
index 72e602521..fadcdb7fd 100644
--- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
@@ -65,6 +65,7 @@ define([
                 /** coauthoring end **/
                 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-spellcheck': _.bind(this.onCoauthOptions, this),
+                'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-support': function() {
                     var config = this.mode.customization;
                     config && !!config.feedback && !!config.feedback.url ?
@@ -90,6 +91,15 @@ define([
                 enableToggle: true
             });
 
+            this.btnSearchBar = new Common.UI.Button({
+                action: 'advancedsearch',
+                el: $markup.elementById('#left-btn-searchbar'),
+                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                disabled: true,
+                enableToggle: true,
+                toggleGroup: 'leftMenuGroup'
+            });
+
             this.btnAbout = new Common.UI.Button({
                 action: 'about',
                 el: $markup.elementById('#left-btn-about'),
@@ -152,6 +162,7 @@ define([
             this.btnSpellcheck.on('click',      _.bind(this.onBtnMenuClick, this));
 
             this.btnSearch.on('click',          _.bind(this.onBtnMenuClick, this));
+            this.btnSearchBar.on('click',       _.bind(this.onBtnMenuClick, this));
             this.btnAbout.on('toggle',          _.bind(this.onBtnMenuToggle, this));
 
             this.menuFile = new SSE.Views.FileMenu({});
@@ -226,6 +237,13 @@ define([
                 } else
                     this.panelSpellcheck['hide']();
             }
+            if (this.panelSearch) {
+                if (this.btnSearchBar.pressed) {
+                    this.panelSearch.show();
+                } else {
+                    this.panelSearch.hide();
+                }
+            }
             // if (this.mode.canPlugins && this.panelPlugins) {
             //     if (this.btnPlugins.pressed) {
             //         this.panelPlugins.show();
@@ -247,6 +265,9 @@ define([
                 this.panelSpellcheck = panel.render('#left-panel-spellcheck');
             } else if (name == 'history') {
                 this.panelHistory = panel.render('#left-panel-history');
+            } else
+            if (name == 'advancedsearch') {
+                this.panelSearch = panel.render('#left-panel-search');
             }
         },
 
@@ -288,10 +309,14 @@ define([
                 this.panelSpellcheck['hide']();
                 this.btnSpellcheck.toggle(false, true);
             }
+            if (this.panelSearch) {
+                this.panelSearch['hide']();
+                this.btnSearchBar.toggle(false, true);
+            }
         },
 
         isOpened: function() {
-            var isopened = this.btnSearch.pressed;
+            var isopened = this.btnSearchBar.pressed;
             /** coauthoring begin **/
             !isopened && (isopened = this.btnComments.pressed || this.btnChat.pressed);
             /** coauthoring end **/
@@ -302,6 +327,7 @@ define([
             this.btnAbout.setDisabled(false);
             this.btnSupport.setDisabled(false);
             this.btnSearch.setDisabled(false);
+            this.btnSearchBar.setDisabled(false);
             /** coauthoring begin **/
             this.btnComments.setDisabled(false);
             this.btnChat.setDisabled(false);
@@ -333,6 +359,13 @@ define([
                         this.onCoauthOptions();
                         this.btnComments.$el.focus();
                     }
+                } else if (menu == 'advancedsearch') {
+                    if (this.btnSearchBar.isVisible() &&
+                        !this.btnSearchBar.isDisabled() && !this.btnSearchBar.pressed) {
+                        this.btnSearchBar.toggle(true);
+                        this.onBtnMenuClick(this.btnSearchBar);
+                        this.onCoauthOptions();
+                    }
                 }
                 /** coauthoring end **/
             }
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index c3253a8fe..13e50402c 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -149,6 +149,7 @@ require([
             'PivotTable',
             'DataTab',
             'ViewTab',
+            'Search',
             'WBProtection',
             'Common.Controllers.Fonts',
             'Common.Controllers.History',
@@ -175,6 +176,7 @@ require([
             'spreadsheeteditor/main/app/controller/PivotTable',
             'spreadsheeteditor/main/app/controller/DataTab',
             'spreadsheeteditor/main/app/controller/ViewTab',
+            'spreadsheeteditor/main/app/controller/Search',
             'spreadsheeteditor/main/app/controller/WBProtection',
             'spreadsheeteditor/main/app/view/FileMenuPanels',
             'spreadsheeteditor/main/app/view/ParagraphSettings',

From 92e95b1509acb76818f36e4f6f7da6fd5dd0402b Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Thu, 24 Feb 2022 21:46:22 +0300
Subject: [PATCH 09/52] [SSE] New search: make search options

---
 .../main/lib/template/SearchPanel.template    |  8 +++-
 apps/common/main/lib/view/SearchPanel.js      | 15 +++++++
 .../main/resources/less/searchdialog.less     | 44 ++++++++++++++++++-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 7d0778a40..d18186719 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -29,9 +29,13 @@
                        <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
                     </td>
                 </tr>
-                <tr>
+                <tr class="search-options-block">
                     <td class="padding-large">
-                        <div class="search-options">
+                        <div id="open-search-options">
+                            <div class="search-options-caret img-commonctrl"></div>
+                            <div class="search-options-txt"><%= scope.textSearchOptions %></div>
+                        </div>
+                        <div id="search-options">
                             <label class="input-label"><%= scope.textWithin %></label>
                             <div id="search-adv-cmb-within"></div>
                             <label class="input-label"><%= scope.textSearch %></label>
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 80a428b12..81ae26cf6 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -52,6 +52,9 @@ define([
             Common.UI.BaseView.prototype.initialize.call(this, arguments);
 
             this.isEdit = options.mode.isEdit;
+
+
+            window.SSE && (this.extendedOptions = Common.localStorage.getBool('sse-search-options-extended', true));
         },
 
         render: function(el) {
@@ -176,6 +179,12 @@ define([
                     hint: this.textCloseSearch
                 });
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
+
+                if (window.SSE) {
+                    this.$searchOptionsBlock = $('.search-options-block');
+                    this.$searchOptionsBlock.show();
+                    $('#open-search-options').on('click', _.bind(this.expandSearchOptions, this));
+                }
             }
 
             this.rendered = true;
@@ -232,6 +241,11 @@ define([
             };
         },
 
+        expandSearchOptions: function () {
+            this.extendedOptions = !this.extendedOptions;
+            this.$searchOptionsBlock[this.extendedOptions ? 'removeClass' : 'addClass']('no-expand');
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
@@ -251,6 +265,7 @@ define([
         textByColumns: 'By columns',
         textFormulas: 'Formulas',
         textValues: 'Values',
+        textSearchOptions: 'Search options'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 7c15eb31a..e1606b081 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -147,7 +147,49 @@
         }
     }
 
-    .search-options {
+    .search-options-block {
         display: none;
     }
+
+    #open-search-options {
+        cursor: pointer;
+        margin-left: 15px;
+
+        .search-options-txt {
+            display: inline-block;
+            padding: 5px 0;
+        }
+
+        .search-options-caret {
+            width: 24px;
+            height: 24px;
+            background-position: 3px -270px;
+            display: inline-block;
+            position: absolute;
+            left: 0;
+            cursor: pointer;
+            margin-left: 8px;
+        }
+
+    }
+
+    #search-options {
+
+        label {
+            margin-top: 6px;
+            &:not(:first-of-type) {
+                margin-top: 8px;
+            }
+        }
+    }
+
+    .no-expand {
+        #search-options {
+            display: none;
+        }
+        .search-options-caret {
+            transform: rotate(270deg);
+        }
+    }
+
 }
\ No newline at end of file

From 2de78cda7920d0f52ea2870bc3a37b68525ddda5 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 25 Feb 2022 15:31:15 +0300
Subject: [PATCH 10/52] [SSE] New search: make search options (2)

---
 apps/common/main/lib/view/SearchPanel.js      | 92 +++++++++++--------
 .../main/app/controller/Search.js             | 32 ++++---
 2 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 81ae26cf6..ca8a763f7 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -115,6 +115,7 @@ define([
                 this.chCaseSensitive = new Common.UI.CheckBox({
                     el: $('#search-adv-case-sensitive'),
                     labelText: this.textCaseSensitive,
+                    value: false,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
@@ -131,47 +132,12 @@ define([
                 this.chMatchWord = new Common.UI.CheckBox({
                     el: $('#search-adv-match-word'),
                     labelText: this.options.matchwordstr || this.textWholeWords,
+                    value: false,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
                 });
 
-                this.cmbWithin = new Common.UI.ComboBox({
-                    el: $('#search-adv-cmb-within'),
-                    menuStyle: 'min-width: 100%;',
-                    style: "width: 219px;",
-                    editable: false,
-                    cls: 'input-group-nr',
-                    data: [
-                        { value: 0, displayValue: this.textSheet },
-                        { value: 1, displayValue: this.textWorkbook }
-                    ]
-                });
-
-                this.cmbSearch = new Common.UI.ComboBox({
-                    el: $('#search-adv-cmb-search'),
-                    menuStyle: 'min-width: 100%;',
-                    style: "width: 219px;",
-                    editable: false,
-                    cls: 'input-group-nr',
-                    data: [
-                        { value: 0, displayValue: this.textByRows },
-                        { value: 1, displayValue: this.textByColumns }
-                    ]
-                });
-
-                this.cmbLookIn = new Common.UI.ComboBox({
-                    el: $('#search-adv-cmb-look-in'),
-                    menuStyle: 'min-width: 100%;',
-                    style: "width: 219px;",
-                    editable: false,
-                    cls: 'input-group-nr',
-                    data: [
-                        { value: 0, displayValue: this.textFormulas },
-                        { value: 1, displayValue: this.textValues }
-                    ]
-                });
-
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -181,9 +147,54 @@ define([
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
 
                 if (window.SSE) {
+
+                    this.cmbWithin = new Common.UI.ComboBox({
+                        el: $('#search-adv-cmb-within'),
+                        menuStyle: 'min-width: 100%;',
+                        style: "width: 219px;",
+                        editable: false,
+                        cls: 'input-group-nr',
+                        data: [
+                            { value: 0, displayValue: this.textSheet },
+                            { value: 1, displayValue: this.textWorkbook }
+                        ]
+                    });
+
+                    this.cmbSearch = new Common.UI.ComboBox({
+                        el: $('#search-adv-cmb-search'),
+                        menuStyle: 'min-width: 100%;',
+                        style: "width: 219px;",
+                        editable: false,
+                        cls: 'input-group-nr',
+                        data: [
+                            { value: 0, displayValue: this.textByRows },
+                            { value: 1, displayValue: this.textByColumns }
+                        ]
+                    });
+
+                    this.cmbLookIn = new Common.UI.ComboBox({
+                        el: $('#search-adv-cmb-look-in'),
+                        menuStyle: 'min-width: 100%;',
+                        style: "width: 219px;",
+                        editable: false,
+                        cls: 'input-group-nr',
+                        data: [
+                            { value: 0, displayValue: this.textFormulas },
+                            { value: 1, displayValue: this.textValues }
+                        ]
+                    });
+
                     this.$searchOptionsBlock = $('.search-options-block');
                     this.$searchOptionsBlock.show();
                     $('#open-search-options').on('click', _.bind(this.expandSearchOptions, this));
+
+                    if (!this.extendedOptions) {
+                        this.$searchOptionsBlock.addClass('no-expand');
+                    }
+
+                    this.cmbWithin.setValue(0);
+                    this.cmbSearch.setValue(0);
+                    this.cmbLookIn.setValue(0);
                 }
             }
 
@@ -241,9 +252,18 @@ define([
             };
         },
 
+        getExtraSettings: function () {
+            return {
+                within: !this.cmbWithin.getValue(),
+                search: !this.cmbSearch.getValue(),
+                lookIn: !this.cmbLookIn.getValue()
+            };
+        },
+
         expandSearchOptions: function () {
             this.extendedOptions = !this.extendedOptions;
             this.$searchOptionsBlock[this.extendedOptions ? 'removeClass' : 'addClass']('no-expand');
+            Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions);
         },
 
         textFind: 'Find',
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index d9d33bbb2..d9c3a8c0d 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -94,9 +94,11 @@ define([
             options.asc_setScanForward(d != 'back');
             options.asc_setIsMatchCase(opts.matchcase);
             options.asc_setIsWholeCell(opts.matchword);
-            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+
+            var extraOptions = this.view.getExtraSettings();
+            options.asc_setScanOnOnlySheet(extraOptions.within);
+            options.asc_setScanByRows(extraOptions.search);
+            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
 
             if (!this.api.asc_findText(options)) {
                 var me = this;
@@ -121,9 +123,11 @@ define([
             options.asc_setReplaceWith(opts.textreplace);
             options.asc_setIsMatchCase(opts.matchcase);
             options.asc_setIsWholeCell(opts.matchword);
-            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+
+            var extraOptions = this.view.getExtraSettings();
+            options.asc_setScanOnOnlySheet(extraOptions.within);
+            options.asc_setScanByRows(extraOptions.search);
+            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
             options.asc_setIsReplaceAll(false);
 
             this.api.asc_replaceText(options);
@@ -137,9 +141,11 @@ define([
             options.asc_setReplaceWith(opts.textreplace);
             options.asc_setIsMatchCase(opts.matchcase);
             options.asc_setIsWholeCell(opts.matchword);
-            //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-            //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-            //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+
+            var extraOptions = this.view.getExtraSettings();
+            options.asc_setScanOnOnlySheet(extraOptions.within);
+            options.asc_setScanByRows(extraOptions.search);
+            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
             options.asc_setIsReplaceAll(true);
 
             this.api.asc_replaceText(options);
@@ -161,9 +167,11 @@ define([
                 options.asc_setScanForward(true);
                 options.asc_setIsMatchCase(sett.matchcase);
                 options.asc_setIsWholeCell(sett.matchword);
-                //options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-                //options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-                //options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
+
+                var extraOptions = this.view.getExtraSettings();
+                options.asc_setScanOnOnlySheet(extraOptions.within);
+                options.asc_setScanByRows(extraOptions.search);
+                options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
 
 
                 if (!me.api.asc_findText(options)) {

From 468e51cc8e3488c5f5384a6be9e726a57ed7f5ed Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 25 Feb 2022 16:55:46 +0300
Subject: [PATCH 11/52] [PE] New search: add left panel, add controller

---
 .../main/app/controller/Search.js             |   1 -
 apps/presentationeditor/main/app.js           |   2 +
 .../main/app/controller/LeftMenu.js           |   5 +
 .../main/app/controller/Search.js             | 126 ++++++++++++++++++
 .../main/app/template/LeftMenu.template       |   2 +
 .../main/app/view/LeftMenu.js                 |  35 ++++-
 apps/presentationeditor/main/app_dev.js       |   2 +
 .../main/app/controller/Search.js             |   1 -
 8 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 apps/presentationeditor/main/app/controller/Search.js

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 562d3cb2e..c09206667 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -53,7 +53,6 @@ define([
         ],
 
         initialize: function () {
-            console.log('init');
             this.addListeners({
                 'SearchBar': {
                     'search:back': _.bind(this.onQuerySearch, this, 'back'),
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index 0b2f1c272..8e22ee158 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -153,6 +153,7 @@ require([
             'LeftMenu',
             'Main',
             'ViewTab',
+            'Search',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -178,6 +179,7 @@ require([
             'presentationeditor/main/app/controller/LeftMenu',
             'presentationeditor/main/app/controller/Main',
             'presentationeditor/main/app/controller/ViewTab',
+            'presentationeditor/main/app/controller/Search',
             'presentationeditor/main/app/view/FileMenuPanels',
             'presentationeditor/main/app/view/ParagraphSettings',
             'presentationeditor/main/app/view/ImageSettings',
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 3be667173..e26083eef 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -171,6 +171,8 @@ define([
             if (this.mode.canUseHistory)
                 this.getApplication().getController('Common.Controllers.History').setApi(this.api).setMode(this.mode);
             this.leftMenu.btnThumbs.toggle(true);
+            this.getApplication().getController('Search').setApi(this.api).setMode(this.mode);
+            this.leftMenu.setOptionsPanel('advancedsearch', this.getApplication().getController('Search').getView('Common.Views.SearchPanel'));
             return this;
         },
 
@@ -747,6 +749,9 @@ define([
 
                     // focus to sdk
                     this.api.asc_enableKeyEvents(true);
+                } else if (this.leftMenu.btnSearchBar.isActive()) {
+                    this.leftMenu.btnSearchBar.toggle(false);
+                    this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
                 }
             }
         },
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
new file mode 100644
index 000000000..48af40a15
--- /dev/null
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -0,0 +1,126 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ViewTab.js
+ *
+ *  Created by Julia Svinareva on 25.02.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'core',
+    'common/main/lib/view/SearchPanel'
+], function () {
+    'use strict';
+
+    PE.Controllers.Search = Backbone.Controller.extend(_.extend({
+        sdkViewName : '#id_main',
+
+        views: [
+            'Common.Views.SearchPanel'
+        ],
+
+        initialize: function () {
+            this.addListeners({
+                'SearchBar': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                },
+                'Common.Views.SearchPanel': {
+                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
+                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:replace': _.bind(this.onQueryReplace, this),
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
+                }
+            });
+        },
+        onLaunch: function () {
+            this._state = {};
+        },
+
+        setMode: function (mode) {
+            this.view = this.createView('Common.Views.SearchPanel', { mode: mode });
+        },
+
+        setApi: function (api) {
+            if (api) {
+                this.api = api;
+            }
+            return this;
+        },
+
+        getView: function(name) {
+            return !name && this.view ?
+                this.view : Backbone.Controller.prototype.getView.call(this, name);
+        },
+
+        onQuerySearch: function (d, w, opts) {
+            if (opts.textsearch && opts.textsearch.length) {
+                if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
+                    var me = this;
+                    Common.UI.info({
+                        msg: this.textNoTextFound,
+                        callback: function() {
+                            //me.dlgSearch.focus();
+                        }
+                    });
+                }
+            }
+        },
+
+        onQueryReplace: function(w, opts) {
+            if (!_.isEmpty(opts.textsearch)) {
+                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
+                    var me = this;
+                    Common.UI.info({
+                        msg: this.textNoTextFound,
+                        callback: function() {
+                            me.view.focus();
+                        }
+                    });
+                }
+            }
+        },
+
+        onQueryReplaceAll: function(w, opts) {
+            if (!_.isEmpty(opts.textsearch)) {
+                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase);
+            }
+        },
+
+        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
+
+    }, PE.Controllers.Search || {}));
+});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template
index abd645e85..384fc8c88 100644
--- a/apps/presentationeditor/main/app/template/LeftMenu.template
+++ b/apps/presentationeditor/main/app/template/LeftMenu.template
@@ -1,6 +1,7 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
         <button id="left-btn-search" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
@@ -11,6 +12,7 @@
         <button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>
     <div class="left-panel" style="">
+        <div id="left-panel-search" class="" style="display: none;"></div>
         <!-- /** coauthoring begin **/ -->
         <div id="left-panel-comments" class="" style="display: none;"></div>
         <div id="left-panel-chat" class="" style="display: none;"></div>
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index c1868b7db..00c3a90b0 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -72,6 +72,7 @@ define([
                 'click #left-btn-chat': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
                 /** coauthoring end **/
+                'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-support': function() {
                     var config = this.mode.customization;
                     config && !!config.feedback && !!config.feedback.url ?
@@ -97,6 +98,15 @@ define([
                 enableToggle: true
             });
 
+            this.btnSearchBar = new Common.UI.Button({
+                action: 'advancedsearch',
+                el: $markup.elementById('#left-btn-searchbar'),
+                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                disabled: true,
+                enableToggle: true,
+                toggleGroup: 'leftMenuGroup'
+            });
+
             this.btnThumbs = new Common.UI.Button({
                 action: 'thumbs',
                 el: $markup.elementById('#left-btn-thumbs'),
@@ -157,6 +167,7 @@ define([
             this.btnPlugins.on('click',         _.bind(this.onBtnMenuClick, this));
             
             this.btnSearch.on('click',          _.bind(this.onBtnMenuClick, this));
+            this.btnSearchBar.on('click',       _.bind(this.onBtnMenuClick, this));
             this.btnThumbs.on('click',          _.bind(this.onBtnMenuClick, this));
             this.btnAbout.on('toggle',          _.bind(this.onBtnMenuToggle, this));
             this.btnAbout.on('click',           _.bind(this.onFullMenuClick, this));
@@ -241,6 +252,13 @@ define([
                 }
             }
             /** coauthoring end **/
+            if (this.panelSearch) {
+                if (this.btnSearchBar.pressed) {
+                    this.panelSearch.show();
+                } else {
+                    this.panelSearch.hide();
+                }
+            }
             // if (this.mode.canPlugins && this.panelPlugins) {
             //     if (this.btnPlugins.pressed) {
             //         this.panelPlugins.show();
@@ -260,6 +278,9 @@ define([
                 this.panelPlugins = panel.render('#left-panel-plugins');
             } else if (name == 'history') {
                 this.panelHistory = panel.render('#left-panel-history');
+            } else
+            if (name == 'advancedsearch') {
+                this.panelSearch = panel.render('#left-panel-search');
             }
         },
 
@@ -299,11 +320,15 @@ define([
                 this.panelPlugins['hide']();
                 this.btnPlugins.toggle(false, true);
             }
+            if (this.panelSearch) {
+                this.panelSearch['hide']();
+                this.btnSearchBar.toggle(false, true);
+            }
             this.fireEvent('panel:show', [this, '', false]);
         },
 
         isOpened: function() {
-            var isopened = this.btnSearch.pressed;
+            var isopened = this.btnSearchBar.pressed;
             /** coauthoring begin **/
             !isopened && (isopened = this.btnComments.pressed || this.btnChat.pressed);
             /** coauthoring end **/
@@ -311,6 +336,7 @@ define([
         },
 
         disableMenu: function(menu, disable) {
+            this.btnSearchBar.setDisabled(disable);
             this.btnThumbs.setDisabled(disable);
             this.btnAbout.setDisabled(disable);
             this.btnSupport.setDisabled(disable);
@@ -342,6 +368,13 @@ define([
                         this.onBtnMenuClick(this.btnComments);
                         this.onCoauthOptions();
                     }
+                } else if (menu == 'advancedsearch') {
+                    if (this.btnSearchBar.isVisible() &&
+                        !this.btnSearchBar.isDisabled() && !this.btnSearchBar.pressed) {
+                        this.btnSearchBar.toggle(true);
+                        this.onBtnMenuClick(this.btnSearchBar);
+                        this.onCoauthOptions();
+                    }
                 }
                 /** coauthoring end **/
             }
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index 37ddc109a..38cbef2d2 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -144,6 +144,7 @@ require([
             'LeftMenu',
             'Main',
             'ViewTab',
+            'Search',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -169,6 +170,7 @@ require([
             'presentationeditor/main/app/controller/LeftMenu',
             'presentationeditor/main/app/controller/Main',
             'presentationeditor/main/app/controller/ViewTab',
+            'presentationeditor/main/app/controller/Search',
             'presentationeditor/main/app/view/FileMenuPanels',
             'presentationeditor/main/app/view/ParagraphSettings',
             'presentationeditor/main/app/view/ImageSettings',
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index d9c3a8c0d..9fe63fbc2 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -53,7 +53,6 @@ define([
         ],
 
         initialize: function () {
-            console.log('init');
             this.addListeners({
                 'SearchBar': {
                     'search:back': _.bind(this.onQuerySearch, this, 'back'),

From 3a774f6546cb604f06a9015b689cdfeae2323537 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 28 Feb 2022 17:41:00 +0300
Subject: [PATCH 12/52] [PE SSE] New search: add search bar window

---
 .../main/app/controller/LeftMenu.js           | 13 ++++++++++++
 .../main/app/controller/Viewport.js           | 20 +++++++++++++++++++
 .../main/app/controller/LeftMenu.js           | 13 ++++++++++++
 .../main/app/controller/Viewport.js           | 20 +++++++++++++++++++
 4 files changed, 66 insertions(+)

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index e26083eef..95d73dc93 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -107,6 +107,9 @@ define([
                 },
                 'Common.Views.ReviewChanges': {
                     'collaboration:chat': _.bind(this.onShowHideChat, this)
+                },
+                'SearchBar': {
+                    'search:show': _.bind(this.onShowHideSearch, this)
                 }
             });
             Common.NotificationCenter.on('leftmenu:change', _.bind(this.onMenuChange, this));
@@ -768,6 +771,16 @@ define([
             }
         },
 
+        onShowHideSearch: function (state) {
+            if (state) {
+                Common.UI.Menu.Manager.hideAll();
+                this.leftMenu.showMenu('advancedsearch');
+            } else {
+                this.leftMenu.btnSearchBar.toggle(false, true);
+                this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
+            }
+        },
+
         showHistory: function() {
             if (!this.mode.wopi) {
                 var maincontroller = PE.getController('Main');
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index b79d21b1d..93d072182 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -43,6 +43,7 @@
 define([
     'core',
     'common/main/lib/view/Header',
+    'common/main/lib/view/SearchBar',
     'presentationeditor/main/app/view/DocumentPreview',
     'presentationeditor/main/app/view/Viewport'
 //    'documenteditor/main/app/view/LeftMenu'
@@ -341,6 +342,7 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
+                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
         },
 
@@ -512,6 +514,24 @@ define([
             Common.localStorage.setBool('pe-hidden-notes', !bIsShow);
         },
 
+        onSearchClick: function () {
+            if (!this.searchBar) {
+                this.searchBar = new Common.UI.SearchBar({});
+            }
+            if (this.header.btnSearch.pressed) {
+                if (this.searchBar.isVisible()) {
+                    this.searchBar.focus();
+                } else {
+                    this.searchBar.show();
+                }
+            } else {
+                this.searchBar.hide();
+            }
+            this.searchBar.on('hide', _.bind(function () {
+                this.header.btnSearch.toggle(false);
+            }, this));
+        },
+
         textFitPage: 'Fit to Page',
         textFitWidth: 'Fit to Width'
     }, PE.Controllers.Viewport));
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 0df79e991..911cc0f2a 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -99,6 +99,9 @@ define([
                 },
                 'Common.Views.ReviewChanges': {
                     'collaboration:chat': _.bind(this.onShowHideChat, this)
+                },
+                'SearchBar': {
+                    'search:show': _.bind(this.onShowHideSearch, this)
                 }
             });
             Common.NotificationCenter.on('app:comment:add', _.bind(this.onAppAddComment, this));
@@ -977,6 +980,16 @@ define([
             }
         },
 
+        onShowHideSearch: function (state) {
+            if (state) {
+                Common.UI.Menu.Manager.hideAll();
+                this.leftMenu.showMenu('advancedsearch');
+            } else {
+                this.leftMenu.btnSearchBar.toggle(false, true);
+                this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
+            }
+        },
+
         onMenuChange: function (value) {
             if ('hide' === value) {
                 if (this.leftMenu.btnComments.isActive() && this.api) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index 171cbf229..fc15ad3ad 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -43,6 +43,7 @@
 define([
     'core',
     'common/main/lib/view/Header',
+    'common/main/lib/view/SearchBar',
     'spreadsheeteditor/main/app/view/Viewport'
 //    ,'spreadsheeteditor/main/app/view/LeftMenu'
 ], function (Viewport) {
@@ -347,6 +348,7 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
+                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
         },
 
@@ -542,6 +544,24 @@ define([
             this.header.mnuitemFreezePanes.setDisabled(disabled);
         },
 
+        onSearchClick: function () {
+            if (!this.searchBar) {
+                this.searchBar = new Common.UI.SearchBar({});
+            }
+            if (this.header.btnSearch.pressed) {
+                if (this.searchBar.isVisible()) {
+                    this.searchBar.focus();
+                } else {
+                    this.searchBar.show();
+                }
+            } else {
+                this.searchBar.hide();
+            }
+            this.searchBar.on('hide', _.bind(function () {
+                this.header.btnSearch.toggle(false);
+            }, this));
+        },
+
         textHideFBar: 'Hide Formula Bar',
         textHideHeadings: 'Hide Headings',
         textHideGridlines: 'Hide Gridlines',

From 2ac854edc47baeacc1b84cc4a99bb64902822dd4 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 2 Mar 2022 13:58:18 +0300
Subject: [PATCH 13/52] [DE PE SSE] New search: hide settings in view mode

---
 .../main/lib/template/SearchPanel.template    |  6 ++--
 apps/common/main/lib/view/SearchPanel.js      | 31 +++++++++++--------
 .../main/app/controller/LeftMenu.js           | 14 ++++++++-
 .../main/app/controller/LeftMenu.js           | 14 ++++++++-
 .../main/app/controller/LeftMenu.js           | 14 ++++++++-
 5 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index d18186719..18731d4cd 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -1,6 +1,6 @@
 <div id="search-box" class="layout-ct vbox search-panel">
     <div id="search-header">
-        <label><%= headerText %></label>
+        <label id="search-adv-title"></label>
         <div id="search-btn-close"></div>
     </div>
     <div id="search-adv-settings">
@@ -9,7 +9,7 @@
                 <tr>
                     <td class="padding-small"><div id="search-adv-text"></div></td>
                 </tr>
-                <tr>
+                <tr class="edit-setting">
                     <td class="padding-large"><div id="search-adv-replace-text"></div></td>
                 </tr>
                 <tr>
@@ -23,7 +23,7 @@
                         </div>
                     </td>
                 </tr>
-                <tr>
+                <tr class="edit-setting">
                     <td class="padding-large">
                        <button type="button" class="btn btn-text-default" id="search-adv-replace" style="display: inline-block; min-width: 62px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
                        <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index ca8a763f7..764175cec 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -51,8 +51,7 @@ define([
             _.extend(this, options);
             Common.UI.BaseView.prototype.initialize.call(this, arguments);
 
-            this.isEdit = options.mode.isEdit;
-
+            this.mode = false;
 
             window.SSE && (this.extendedOptions = Common.localStorage.getBool('sse-search-options-extended', true));
         },
@@ -61,8 +60,7 @@ define([
             if (!this.rendered) {
                 el = el || this.el;
                 $(el).html(this.template({
-                    scope: this,
-                    headerText: this.isEdit ? this.textFindAndReplace : this.textFind
+                    scope: this
                 }));
                 this.$el = $(el);
 
@@ -129,15 +127,6 @@ define([
                     dataHintOffset: 'small'
                 });
 
-                this.chMatchWord = new Common.UI.CheckBox({
-                    el: $('#search-adv-match-word'),
-                    labelText: this.options.matchwordstr || this.textWholeWords,
-                    value: false,
-                    dataHint: '1',
-                    dataHintDirection: 'left',
-                    dataHintOffset: 'small'
-                });
-
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -147,6 +136,14 @@ define([
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
 
                 if (window.SSE) {
+                    this.chMatchWord = new Common.UI.CheckBox({
+                        el: $('#search-adv-match-word'),
+                        labelText: this.options.matchwordstr || this.textWholeWords,
+                        value: false,
+                        dataHint: '1',
+                        dataHintDirection: 'left',
+                        dataHintOffset: 'small'
+                    });
 
                     this.cmbWithin = new Common.UI.ComboBox({
                         el: $('#search-adv-cmb-within'),
@@ -221,6 +218,14 @@ define([
             }, 10);
         },
 
+        setSearchMode: function (mode) {
+            if (this.mode !== mode) {
+                this.$el.find('.edit-setting')[mode !== 'no-replace' ? 'show' : 'hide']();
+                this.$el.find('#search-adv-title').text(mode !== 'no-replace' ? this.textFindAndReplace : this.textFind);
+                this.mode = mode;
+            }
+        },
+
         ChangeSettings: function(props) {
         },
 
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 67ac025c4..1cd72977c 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -127,6 +127,7 @@ define([
         onLaunch: function() {
             this.leftMenu = this.createView('LeftMenu').render();
             this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
+            this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
 
             Common.util.Shortcuts.delegateShortcuts({
                 shortcuts: {
@@ -666,6 +667,8 @@ define([
             this.viewmode = mode;
 
             this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
+
+            this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
         SetDisabled: function(disable, options) {
@@ -918,9 +921,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state) {
+        onShowHideSearch: function (state, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
+                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
@@ -928,6 +933,13 @@ define([
             }
         },
 
+        onMenuSearchBar: function(obj, show) {
+            if (show) {
+                var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
+            }
+        },
+
         isCommentsVisible: function() {
             return this.leftMenu && this.leftMenu.panelComments && this.leftMenu.panelComments.isVisible();
         },
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 95d73dc93..3932f5c48 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -124,6 +124,7 @@ define([
             this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
             this.leftMenu.btnThumbs.on('toggle', _.bind(this.onShowTumbnails, this));
             this.isThumbsShown = true;
+            this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
 
             Common.util.Shortcuts.delegateShortcuts({
                 shortcuts: {
@@ -537,6 +538,8 @@ define([
             this.viewmode = mode;
 
             this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
+
+            this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
         onApiServerDisconnect: function(enableDownload) {
@@ -771,9 +774,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state) {
+        onShowHideSearch: function (state, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
+                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
@@ -781,6 +786,13 @@ define([
             }
         },
 
+        onMenuSearchBar: function(obj, show) {
+            if (show) {
+                var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
+            }
+        },
+
         showHistory: function() {
             if (!this.mode.wopi) {
                 var maincontroller = PE.getController('Main');
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 911cc0f2a..76d56330a 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -116,6 +116,7 @@ define([
         onLaunch: function() {
             this.leftMenu = this.createView('LeftMenu').render();
             this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
+            this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
 
             Common.util.Shortcuts.delegateShortcuts({
                 shortcuts: {
@@ -722,6 +723,8 @@ define([
             this.viewmode = mode;
 
             this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
+
+            this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
         onApiServerDisconnect: function(enableDownload) {
@@ -980,9 +983,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state) {
+        onShowHideSearch: function (state, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
+                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
@@ -990,6 +995,13 @@ define([
             }
         },
 
+        onMenuSearchBar: function(obj, show) {
+            if (show) {
+                var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
+                this.leftMenu.panelSearch.setSearchMode(mode);
+            }
+        },
+
         onMenuChange: function (value) {
             if ('hide' === value) {
                 if (this.leftMenu.btnComments.isActive() && this.api) {

From 2bfe6b2d2ccd43d7c49e6053d081e7603d8959fc Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 2 Mar 2022 21:48:37 +0300
Subject: [PATCH 14/52] [DE PE SSE] New search: add filling find input, fix
 view mode

---
 apps/common/main/lib/view/SearchBar.js                  | 5 +++--
 apps/common/main/lib/view/SearchPanel.js                | 4 ++++
 apps/documenteditor/main/app/controller/LeftMenu.js     | 3 ++-
 apps/documenteditor/main/app/controller/Viewport.js     | 2 +-
 apps/presentationeditor/main/app/controller/LeftMenu.js | 3 ++-
 apps/presentationeditor/main/app/controller/Viewport.js | 2 +-
 apps/spreadsheeteditor/main/app/controller/LeftMenu.js  | 3 ++-
 apps/spreadsheeteditor/main/app/controller/Viewport.js  | 2 +-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 716f52ed9..4231d1f82 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -118,9 +118,10 @@ define([
 
         show: function() {
             var top = $('#app-title').height() + $('#toolbar').height() + 2,
-                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32;
+                left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
             Common.UI.Window.prototype.show.call(this, left, top);
 
+            this.inputSearch.val('');
             this.focus();
         },
 
@@ -154,7 +155,7 @@ define([
 
         onOpenPanel: function () {
             this.hide();
-            this.fireEvent('search:show', [true]);
+            this.fireEvent('search:show', [true, this.inputSearch.val()]);
         },
 
         textFind: 'Find'
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 764175cec..798fe92f8 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -271,6 +271,10 @@ define([
             Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions);
         },
 
+        setFindText: function (val) {
+            this.inputText.setValue(val);
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 1cd72977c..944fbcaa7 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -921,10 +921,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index b261e8b6b..75bffea04 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -333,13 +333,13 @@ define([
                     cls     : 'btn-toolbar'
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
                 if ( !Common.UI.Themes.isDarkTheme() ) {
                     me.header.menuItemsDarkMode.hide();
                     me.header.menuItemsDarkMode.$el.prev('.divider').hide();
                 }
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         onLayoutChanged: function(area) {
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 3932f5c48..5f941717c 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -774,10 +774,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 93d072182..7eb4a417a 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -342,8 +342,8 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         onLayoutChanged: function(area) {
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 76d56330a..58974f57f 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -983,10 +983,11 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, action) {
+        onShowHideSearch: function (state, findText, action) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
+                findText && this.leftMenu.panelSearch.setFindText(findText);
                 this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
             } else {
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index fc15ad3ad..817b8cc82 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -348,8 +348,8 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                me.header.btnSearch.on('click', me.onSearchClick.bind(this));
             }
+            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
         },
 
         // When our application is ready, lets get started

From f91f696cd69b04e83ccb4314b2c84369af22e6a6 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Thu, 3 Mar 2022 21:55:36 +0300
Subject: [PATCH 15/52] [DE] Make new search: edit shortcut method

---
 apps/common/main/lib/view/SearchBar.js        | 13 ++++-
 apps/common/main/lib/view/SearchPanel.js      | 11 +++--
 .../main/app/controller/LeftMenu.js           | 49 ++++++++++++++++---
 .../main/app/controller/Viewport.js           | 31 ++++++++----
 apps/documenteditor/main/app/view/LeftMenu.js |  1 +
 5 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 4231d1f82..c9f695f4c 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -116,12 +116,17 @@ define([
             return this;
         },
 
-        show: function() {
+        show: function(text) {
             var top = $('#app-title').height() + $('#toolbar').height() + 2,
                 left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
             Common.UI.Window.prototype.show.call(this, left, top);
 
-            this.inputSearch.val('');
+            if (text) {
+                this.inputSearch.val(text);
+            } else {
+                this.inputSearch.val('');
+            }
+
             this.focus();
         },
 
@@ -133,6 +138,10 @@ define([
             }, 10);
         },
 
+        setText: function (text) {
+            this.inputSearch.val(text);
+        },
+
         getSettings: function() {
             return {
 
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 798fe92f8..37df3895c 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -210,11 +210,12 @@ define([
             this.fireEvent('hide', this );
         },
 
-        focus: function() {
-            var me  = this;
+        focus: function(type) {
+            var me  = this,
+                el = type === 'replace' ? me.inputReplace.$el : me.inputText.$el;
             setTimeout(function(){
-                me.inputText.$el.find('input').focus();
-                me.inputText.$el.find('input').select();
+                el.find('input').focus();
+                el.find('input').select();
             }, 10);
         },
 
@@ -243,7 +244,7 @@ define([
                 textreplace : this.inputReplace.getValue(),
                 matchcase   : this.chCaseSensitive.checked,
                 useregexp   : this.chUseRegExp.checked,
-                matchword   : this.chMatchWord.checked,
+                matchword   : this.chMatchWord && this.chMatchWord.checked,
                 //highlight   : this.miHighlight.checked
             };
             this.fireEvent('search:'+action, [this, opts, true]);
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 944fbcaa7..d255e3679 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -80,7 +80,8 @@ define([
                 },
                 'LeftMenu': {
                     'comments:show': _.bind(this.commentsShowHide, this, 'show'),
-                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide'),
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 },
                 'FileMenu': {
                     'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
@@ -798,10 +799,29 @@ define([
             switch (s) {
                 case 'replace':
                 case 'search':
-                    Common.UI.Menu.Manager.hideAll();
-                    this.showSearchDlg(true,s);
-                    this.leftMenu.btnSearch.toggle(true,true);
                     this.leftMenu.btnAbout.toggle(false);
+                    var selectedText = this.api.asc_GetSelectedText();
+                    if (this.isSearchPanelVisible()) {
+                        selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
+                        this.leftMenu.panelSearch.focus(s);
+                        return false;
+                    } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                        if (s === 'replace') {
+                            this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
+                            this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                        } else {
+                            selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
+                            this.getApplication().getController('Viewport').searchBar.focus();
+                            return false;
+                        }
+                    } else if (s === 'search') {
+                        Common.NotificationCenter.trigger('search:show');
+                        return false;
+                    } else {
+                        this.onShowHideSearch(true, selectedText);
+                    }
+                    this.leftMenu.btnSearchBar.toggle(true,true);
+                    this.leftMenu.panelSearch.focus(s);
                     // this.leftMenu.menuFile.hide();
                     return false;
                 case 'save':
@@ -921,24 +941,37 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, findText, action) {
+        onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-                findText && this.leftMenu.panelSearch.setFindText(findText);
-                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
+                this.onShowAfterSearch(findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
+        onShowAfterSearch: function (findText) {
+            var text = findText || this.api.asc_GetSelectedText();
+            if (text) {
+                this.leftMenu.panelSearch.setFindText(text);
+            } else if (text !== undefined) {
+                this.leftMenu.panelSearch.setFindText('');
+            }
+            this.leftMenu.panelSearch.focus();
+        },
+
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
                 this.leftMenu.panelSearch.setSearchMode(mode);
             }
+            this.leftMenu._state.isSearchOpen = show;
+        },
+
+        isSearchPanelVisible: function () {
+            return this.leftMenu._state.isSearchOpen;
         },
 
         isCommentsVisible: function() {
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index 75bffea04..588e27871 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -164,6 +164,7 @@ define([
             Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             Common.NotificationCenter.on('uitheme:changed', this.onThemeChanged.bind(this));
             Common.NotificationCenter.on('contenttheme:dark', this.onContentThemeChangedToDark.bind(this));
+            Common.NotificationCenter.on('search:show', _.bind(this.onSearchShow, this));
         },
 
         onAppShowed: function (config) {
@@ -339,7 +340,7 @@ define([
                     me.header.menuItemsDarkMode.$el.prev('.divider').hide();
                 }
             }
-            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
+            me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
         },
 
         onLayoutChanged: function(area) {
@@ -462,22 +463,32 @@ define([
             this.header && this.header.lockHeaderBtns( 'rename-user', disable);
         },
 
-        onSearchClick: function () {
+        onSearchShow: function () {
+            this.header.btnSearch && this.header.btnSearch.toggle(true);
+        },
+
+        onSearchToggle: function () {
+            var leftMenu = this.getApplication().getController('LeftMenu');
+            if (leftMenu.isSearchPanelVisible()) {
+                this.header.btnSearch.toggle(false, true);
+                leftMenu.getView('LeftMenu').panelSearch.focus();
+                return;
+            }
             if (!this.searchBar) {
                 this.searchBar = new Common.UI.SearchBar({});
+                this.searchBar.on('hide', _.bind(function () {
+                    this.header.btnSearch.toggle(false, true);
+                }, this));
             }
             if (this.header.btnSearch.pressed) {
-                if (this.searchBar.isVisible()) {
-                    this.searchBar.focus();
-                } else {
-                    this.searchBar.show();
-                }
+                this.searchBar.show(this.api.asc_GetSelectedText());
             } else {
                 this.searchBar.hide();
             }
-            this.searchBar.on('hide', _.bind(function () {
-                this.header.btnSearch.toggle(false);
-            }, this));
+        },
+
+        isSearchBarVisible: function () {
+            return this.searchBar && this.searchBar.isVisible();
         },
 
         textFitPage: 'Fit to Page',
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 3499cb27b..f2e08d19f 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -271,6 +271,7 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
+                    this.fireEvent('search:aftershow', this);
                 } else {
                     this.panelSearch.hide();
                 }

From dbf08b77bc529f7c0d729a2f5ac899803ef33678 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 4 Mar 2022 17:38:29 +0300
Subject: [PATCH 16/52] [PE] Make new search: edit shortcut method

---
 .../main/app/controller/LeftMenu.js           | 53 ++++++++++++++++---
 .../main/app/controller/Viewport.js           | 31 +++++++----
 .../main/app/view/LeftMenu.js                 |  1 +
 3 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 5f941717c..8d95869a1 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -79,7 +79,8 @@ define([
                 'LeftMenu': {
                     'panel:show':    _.bind(this.menuExpand, this),
                     'comments:show': _.bind(this.commentsShowHide, this, 'show'),
-                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide'),
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 },
                 'FileMenu': {
                     'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
@@ -648,10 +649,31 @@ define([
                     if ((!previewPanel || !previewPanel.isVisible()) && !this._state.no_slides)  {
                         Common.UI.Menu.Manager.hideAll();
                         var full_menu_pressed = this.leftMenu.btnAbout.pressed;
-                        this.showSearchDlg(true,s);
-                        this.leftMenu.btnSearch.toggle(true,true);
                         this.leftMenu.btnAbout.toggle(false);
                         full_menu_pressed && this.menuExpand(this.leftMenu.btnAbout, 'files', false);
+
+                        var selectedText = this.api.asc_GetSelectedText();
+                        if (this.isSearchPanelVisible()) {
+                            selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
+                            this.leftMenu.panelSearch.focus(s);
+                            return false;
+                        } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                            if (s === 'replace') {
+                                this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
+                                this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                            } else {
+                                selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
+                                this.getApplication().getController('Viewport').searchBar.focus();
+                                return false;
+                            }
+                        } else if (s === 'search') {
+                            Common.NotificationCenter.trigger('search:show');
+                            return false;
+                        } else {
+                            this.onShowHideSearch(true, selectedText);
+                        }
+                        this.leftMenu.btnSearchBar.toggle(true,true);
+                        this.leftMenu.panelSearch.focus(s);
                     }
                     return false;
                 case 'save':
@@ -682,6 +704,10 @@ define([
                     return false;
                 case 'escape':
 //                        if (!this.leftMenu.isOpened()) return true;
+                    var btnSearch = this.getApplication().getController('Viewport').header.btnSearch;
+                    btnSearch.pressed && btnSearch.toggle(false);
+                    this.leftMenu._state.isSearchOpen && (this.leftMenu._state.isSearchOpen = false);
+
                     // TODO:
                     if ( this.leftMenu.menuFile.isVisible() ) {
                         if (Common.UI.HintManager.needCloseFileMenu())
@@ -774,24 +800,37 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, findText, action) {
+        onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-                findText && this.leftMenu.panelSearch.setFindText(findText);
-                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
+                this.onShowAfterSearch(findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
+        onShowAfterSearch: function (findText) {
+            var text = findText || this.api.asc_GetSelectedText();
+            if (text) {
+                this.leftMenu.panelSearch.setFindText(text);
+            } else if (text !== undefined) {
+                this.leftMenu.panelSearch.setFindText('');
+            }
+            this.leftMenu.panelSearch.focus();
+        },
+
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
                 this.leftMenu.panelSearch.setSearchMode(mode);
             }
+            this.leftMenu._state.isSearchOpen = show;
+        },
+
+        isSearchPanelVisible: function () {
+            return this.leftMenu._state.isSearchOpen;
         },
 
         showHistory: function() {
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 7eb4a417a..12ae69ce9 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -174,6 +174,7 @@ define([
 
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
             Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
+            Common.NotificationCenter.on('search:show', _.bind(this.onSearchShow, this));
         },
 
         onAppShowed: function (config) {
@@ -343,7 +344,7 @@ define([
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
             }
-            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
+            me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
         },
 
         onLayoutChanged: function(area) {
@@ -514,22 +515,32 @@ define([
             Common.localStorage.setBool('pe-hidden-notes', !bIsShow);
         },
 
-        onSearchClick: function () {
+        onSearchShow: function () {
+            this.header.btnSearch && this.header.btnSearch.toggle(true);
+        },
+
+        onSearchToggle: function () {
+            var leftMenu = this.getApplication().getController('LeftMenu');
+            if (leftMenu.isSearchPanelVisible()) {
+                this.header.btnSearch.toggle(false, true);
+                leftMenu.getView('LeftMenu').panelSearch.focus();
+                return;
+            }
             if (!this.searchBar) {
                 this.searchBar = new Common.UI.SearchBar({});
+                this.searchBar.on('hide', _.bind(function () {
+                    this.header.btnSearch.toggle(false, true);
+                }, this));
             }
             if (this.header.btnSearch.pressed) {
-                if (this.searchBar.isVisible()) {
-                    this.searchBar.focus();
-                } else {
-                    this.searchBar.show();
-                }
+                this.searchBar.show(this.api.asc_GetSelectedText());
             } else {
                 this.searchBar.hide();
             }
-            this.searchBar.on('hide', _.bind(function () {
-                this.header.btnSearch.toggle(false);
-            }, this));
+        },
+
+        isSearchBarVisible: function () {
+            return this.searchBar && this.searchBar.isVisible();
         },
 
         textFitPage: 'Fit to Page',
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index 00c3a90b0..f3b8f98aa 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -255,6 +255,7 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
+                    this.fireEvent('search:aftershow', this);
                 } else {
                     this.panelSearch.hide();
                 }

From 8763262670e4f0a6306ef6a75fbe683ca0a424a7 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 4 Mar 2022 17:39:59 +0300
Subject: [PATCH 17/52] [DE] Make new search: fix opening after escape

---
 apps/documenteditor/main/app/controller/LeftMenu.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index d255e3679..c9020ccd8 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -848,6 +848,10 @@ define([
                     return false;
                 case 'escape':
 //                        if (!this.leftMenu.isOpened()) return true;
+                    var btnSearch = this.getApplication().getController('Viewport').header.btnSearch;
+                    btnSearch.pressed && btnSearch.toggle(false);
+                    this.leftMenu._state.isSearchOpen && (this.leftMenu._state.isSearchOpen = false);
+
                     if ( this.leftMenu.menuFile.isVisible() ) {
                         if (Common.UI.HintManager.needCloseFileMenu())
                             this.leftMenu.menuFile.hide();

From 2c07d642e17636861d8311561a21c4c96239984b Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 4 Mar 2022 22:33:45 +0300
Subject: [PATCH 18/52] [SSE] Make new search: edit shortcut method

---
 .../main/app/controller/LeftMenu.js           | 57 +++++++++++++++----
 .../main/app/controller/Viewport.js           | 32 +++++++----
 .../main/app/view/LeftMenu.js                 |  1 +
 3 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 58974f57f..84be46512 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -847,13 +847,33 @@ define([
             switch (s) {
                 case 'replace':
                 case 'search':
-                    if (!this.leftMenu.btnSearch.isDisabled()) {
+                    if (!this.leftMenu.btnSearchBar.isDisabled()) {
                         Common.UI.Menu.Manager.hideAll();
-                        this.showSearchDlg(true,s);
-                        this.leftMenu.btnSearch.toggle(true,true);
                         this.leftMenu.btnAbout.toggle(false);
-
                         this.leftMenu.menuFile.hide();
+
+                        var selectedText = this.api.asc_GetSelectedText();
+                        if (this.isSearchPanelVisible()) {
+                            selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
+                            this.leftMenu.panelSearch.focus(s);
+                            return false;
+                        } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                            if (s === 'replace') {
+                                this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
+                                this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                            } else {
+                                selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
+                                this.getApplication().getController('Viewport').searchBar.focus();
+                                return false;
+                            }
+                        } else if (s === 'search') {
+                            Common.NotificationCenter.trigger('search:show');
+                            return false;
+                        } else {
+                            this.onShowHideSearch(true, selectedText);
+                        }
+                        this.leftMenu.btnSearchBar.toggle(true,true);
+                        this.leftMenu.panelSearch.focus(s);
                     }
                     return false;
                 case 'save':
@@ -880,6 +900,10 @@ define([
 
                     return false;
                 case 'escape':
+                    var btnSearch = this.getApplication().getController('Viewport').header.btnSearch;
+                    btnSearch.pressed && btnSearch.toggle(false);
+                    this.leftMenu._state.isSearchOpen && (this.leftMenu._state.isSearchOpen = false);
+
                     if ( this.leftMenu.menuFile.isVisible() ) {
                         if (Common.UI.HintManager.needCloseFileMenu())
                             this.leftMenu.menuFile.hide();
@@ -937,7 +961,7 @@ define([
             var isRangeSelection = (status != Asc.c_oAscSelectionDialogType.None);
 
             this.leftMenu.btnAbout.setDisabled(isRangeSelection);
-            this.leftMenu.btnSearch.setDisabled(isRangeSelection);
+            this.leftMenu.btnSearchBar.setDisabled(isRangeSelection);
             this.leftMenu.btnSpellcheck.setDisabled(isRangeSelection);
             if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
                 this.leftMenu.panelPlugins.setLocked(isRangeSelection);
@@ -949,7 +973,7 @@ define([
             var isEditFormula = (state == Asc.c_oAscCellEditorState.editFormula);
 
             this.leftMenu.btnAbout.setDisabled(isEditFormula);
-            this.leftMenu.btnSearch.setDisabled(isEditFormula);
+            this.leftMenu.btnSearchBar.setDisabled(isEditFormula);
             this.leftMenu.btnSpellcheck.setDisabled(isEditFormula);
             if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
                 this.leftMenu.panelPlugins.setLocked(isEditFormula);
@@ -983,24 +1007,37 @@ define([
             }
         },
 
-        onShowHideSearch: function (state, findText, action) {
+        onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-                findText && this.leftMenu.panelSearch.setFindText(findText);
-                this.leftMenu.panelSearch.setSearchMode(mode);
                 this.leftMenu.showMenu('advancedsearch');
+                this.onShowAfterSearch(findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
+        onShowAfterSearch: function (findText) {
+            var text = findText || this.api.asc_GetSelectedText();
+            if (text) {
+                this.leftMenu.panelSearch.setFindText(text);
+            } else if (text !== undefined) {
+                this.leftMenu.panelSearch.setFindText('');
+            }
+            this.leftMenu.panelSearch.focus();
+        },
+
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
                 this.leftMenu.panelSearch.setSearchMode(mode);
             }
+            this.leftMenu._state.isSearchOpen = show;
+        },
+
+        isSearchPanelVisible: function () {
+            return this.leftMenu._state.isSearchOpen;
         },
 
         onMenuChange: function (value) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index 817b8cc82..0226e0724 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -349,7 +349,7 @@ define([
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
             }
-            me.header.btnSearch.on('click', me.onSearchClick.bind(this));
+            me.header.btnSearch.on('toggle', me.onSearchToggle.bind(this));
         },
 
         // When our application is ready, lets get started
@@ -392,6 +392,8 @@ define([
             this.header.mnuitemHideHeadings = this.header.fakeMenuItem();
             this.header.mnuitemHideGridlines = this.header.fakeMenuItem();
             this.header.mnuitemFreezePanes = this.header.fakeMenuItem();
+
+            Common.NotificationCenter.on('search:show', _.bind(this.onSearchShow, this));
         },
 
         onLayoutChanged: function(area) {
@@ -544,22 +546,32 @@ define([
             this.header.mnuitemFreezePanes.setDisabled(disabled);
         },
 
-        onSearchClick: function () {
+        onSearchShow: function () {
+            this.header.btnSearch && this.header.btnSearch.toggle(true);
+        },
+
+        onSearchToggle: function () {
+            var leftMenu = this.getApplication().getController('LeftMenu');
+            if (leftMenu.isSearchPanelVisible()) {
+                this.header.btnSearch.toggle(false, true);
+                leftMenu.getView('LeftMenu').panelSearch.focus();
+                return;
+            }
             if (!this.searchBar) {
                 this.searchBar = new Common.UI.SearchBar({});
+                this.searchBar.on('hide', _.bind(function () {
+                    this.header.btnSearch.toggle(false, true);
+                }, this));
             }
             if (this.header.btnSearch.pressed) {
-                if (this.searchBar.isVisible()) {
-                    this.searchBar.focus();
-                } else {
-                    this.searchBar.show();
-                }
+                this.searchBar.show(this.api.asc_GetSelectedText());
             } else {
                 this.searchBar.hide();
             }
-            this.searchBar.on('hide', _.bind(function () {
-                this.header.btnSearch.toggle(false);
-            }, this));
+        },
+
+        isSearchBarVisible: function () {
+            return this.searchBar && this.searchBar.isVisible();
         },
 
         textHideFBar: 'Hide Formula Bar',
diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
index fadcdb7fd..77616b502 100644
--- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
@@ -240,6 +240,7 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
+                    this.fireEvent('search:aftershow', this);
                 } else {
                     this.panelSearch.hide();
                 }

From 37b0fd88d3a76e233372329c6a65e2add32f0187 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Sat, 5 Mar 2022 15:44:01 +0300
Subject: [PATCH 19/52] [DE PE] Make new search: add methods to update result
 current number

---
 apps/common/main/lib/view/SearchPanel.js             | 12 ++++++++++--
 apps/documenteditor/main/app/controller/Search.js    |  9 +++++++++
 apps/documenteditor/main/app/controller/Viewport.js  |  1 +
 .../presentationeditor/main/app/controller/Search.js |  9 +++++++++
 .../main/app/controller/Viewport.js                  |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 37df3895c..262c04914 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -81,6 +81,7 @@ define([
                 });
 
                 this.$reaultsNumber = $('#search-adv-results-number');
+                this.updateResultsNumber('no-results');
 
                 this.btnBack = new Common.UI.Button({
                     parentEl: $('#search-adv-back'),
@@ -231,7 +232,8 @@ define([
         },
 
         updateResultsNumber: function (current, count) {
-            this.$reaultsNumber.text(Common.Utils.String.format(current, count));
+            var text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
+            this.$reaultsNumber.text(text);
         },
 
         onClickClosePanel: function() {
@@ -276,6 +278,10 @@ define([
             this.inputText.setValue(val);
         },
 
+        clearResults: function () {
+            this.updateResultsNumber('no-results');
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
@@ -295,7 +301,9 @@ define([
         textByColumns: 'By columns',
         textFormulas: 'Formulas',
         textValues: 'Values',
-        textSearchOptions: 'Search options'
+        textSearchOptions: 'Search options',
+        textNoMatches: 'No matches',
+        textNoSearchResults: 'No search results'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index c09206667..a4c1f9922 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -77,6 +77,7 @@ define([
         setApi: function (api) {
             if (api) {
                 this.api = api;
+                this.api.asc_registerCallback('asc_onSetSearchCurrent', _.bind(this.onUpdateSearchCurrent, this));
             }
             return this;
         },
@@ -90,6 +91,7 @@ define([
             if (opts.textsearch && opts.textsearch.length) {
                 if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
                     var me = this;
+                    me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
                         msg: this.textNoTextFound,
                         callback: function() {
@@ -104,6 +106,7 @@ define([
             if (!_.isEmpty(opts.textsearch)) {
                 if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
                     var me = this;
+                    me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
                         msg: this.textNoTextFound,
                         callback: function() {
@@ -120,6 +123,12 @@ define([
             }
         },
 
+        onUpdateSearchCurrent: function (current, all) {
+            if (this.view) {
+                this.view.updateResultsNumber(current, all);
+            }
+        },
+
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
 
     }, DE.Controllers.Search || {}));
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index 588e27871..9ae5ac5d0 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -482,6 +482,7 @@ define([
             }
             if (this.header.btnSearch.pressed) {
                 this.searchBar.show(this.api.asc_GetSelectedText());
+                leftMenu.getView('LeftMenu').panelSearch.clearResults();
             } else {
                 this.searchBar.hide();
             }
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 48af40a15..34fa0f473 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -77,6 +77,7 @@ define([
         setApi: function (api) {
             if (api) {
                 this.api = api;
+                this.api.asc_registerCallback('asc_onSetSearchCurrent', _.bind(this.onUpdateSearchCurrent, this));
             }
             return this;
         },
@@ -90,6 +91,7 @@ define([
             if (opts.textsearch && opts.textsearch.length) {
                 if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
                     var me = this;
+                    me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
                         msg: this.textNoTextFound,
                         callback: function() {
@@ -104,6 +106,7 @@ define([
             if (!_.isEmpty(opts.textsearch)) {
                 if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
                     var me = this;
+                    me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
                         msg: this.textNoTextFound,
                         callback: function() {
@@ -120,6 +123,12 @@ define([
             }
         },
 
+        onUpdateSearchCurrent: function (current, all) {
+            if (this.view) {
+                this.view.updateResultsNumber(current, all);
+            }
+        },
+
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
 
     }, PE.Controllers.Search || {}));
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 12ae69ce9..7e8f3fed2 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -534,6 +534,7 @@ define([
             }
             if (this.header.btnSearch.pressed) {
                 this.searchBar.show(this.api.asc_GetSelectedText());
+                leftMenu.getView('LeftMenu').panelSearch.clearResults();
             } else {
                 this.searchBar.hide();
             }

From e77f9db33db775ee159ac02ec6a0951aed4f24ca Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 9 Mar 2022 17:39:03 +0300
Subject: [PATCH 20/52] [DE PE] Make new search: add Whole words only, change
 get/put methods in controllers

---
 apps/common/main/lib/view/SearchPanel.js      | 21 ++++++++++---------
 .../main/app/controller/Search.js             | 18 +++++++++++++---
 .../main/app/controller/Search.js             | 18 +++++++++++++---
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 262c04914..ed4038090 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -128,6 +128,15 @@ define([
                     dataHintOffset: 'small'
                 });
 
+                this.chMatchWord = new Common.UI.CheckBox({
+                    el: $('#search-adv-match-word'),
+                    labelText: window.SSE ? this.textItemEntireCell : this.textWholeWords,
+                    value: false,
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
+                });
+
                 this.buttonClose = new Common.UI.Button({
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
@@ -137,15 +146,6 @@ define([
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
 
                 if (window.SSE) {
-                    this.chMatchWord = new Common.UI.CheckBox({
-                        el: $('#search-adv-match-word'),
-                        labelText: this.options.matchwordstr || this.textWholeWords,
-                        value: false,
-                        dataHint: '1',
-                        dataHintDirection: 'left',
-                        dataHintOffset: 'small'
-                    });
-
                     this.cmbWithin = new Common.UI.ComboBox({
                         el: $('#search-adv-cmb-within'),
                         menuStyle: 'min-width: 100%;',
@@ -303,7 +303,8 @@ define([
         textValues: 'Values',
         textSearchOptions: 'Search options',
         textNoMatches: 'No matches',
-        textNoSearchResults: 'No search results'
+        textNoSearchResults: 'No search results',
+        textItemEntireCell: 'Entire cell contents'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index a4c1f9922..620cc35e8 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -89,7 +89,11 @@ define([
 
         onQuerySearch: function (d, w, opts) {
             if (opts.textsearch && opts.textsearch.length) {
-                if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                if (!this.api.asc_findText(searchSettings, d != 'back')) {
                     var me = this;
                     me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
@@ -104,7 +108,11 @@ define([
 
         onQueryReplace: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
-                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                if (!this.api.asc_replaceText(searchSettings, opts.textreplace, false)) {
                     var me = this;
                     me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
@@ -119,7 +127,11 @@ define([
 
         onQueryReplaceAll: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
-                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase, opts.matchword);
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                this.api.asc_replaceText(searchSettings, opts.textreplace, true);
             }
         },
 
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 34fa0f473..b170b4901 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -89,7 +89,11 @@ define([
 
         onQuerySearch: function (d, w, opts) {
             if (opts.textsearch && opts.textsearch.length) {
-                if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase)) {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                if (!this.api.asc_findText(searchSettings, d != 'back')) {
                     var me = this;
                     me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
@@ -104,7 +108,11 @@ define([
 
         onQueryReplace: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
-                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                if (!this.api.asc_replaceText(searchSettings, opts.textreplace, false)) {
                     var me = this;
                     me.view.updateResultsNumber(undefined, 0);
                     Common.UI.info({
@@ -119,7 +127,11 @@ define([
 
         onQueryReplaceAll: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
-                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase);
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(opts.textsearch);
+                searchSettings.put_MatchCase(opts.matchcase);
+                searchSettings.put_WholeWords(opts.matchword);
+                this.api.asc_replaceText(searchSettings, opts.textreplace, true);
             }
         },
 

From ec831ded6ad2cd2f7d3ee693ab61fe5d29e05a2d Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 9 Mar 2022 17:40:50 +0300
Subject: [PATCH 21/52] [DE PE SSE] Make new search: hide search window when
 open search panel

---
 apps/documenteditor/main/app/controller/LeftMenu.js     | 5 +++++
 apps/presentationeditor/main/app/controller/LeftMenu.js | 5 +++++
 apps/spreadsheeteditor/main/app/controller/LeftMenu.js  | 8 +++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index c9020ccd8..5f30ed3e7 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -957,6 +957,11 @@ define([
         },
 
         onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
             var text = findText || this.api.asc_GetSelectedText();
             if (text) {
                 this.leftMenu.panelSearch.setFindText(text);
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 8d95869a1..a2538ec14 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -812,6 +812,11 @@ define([
         },
 
         onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
             var text = findText || this.api.asc_GetSelectedText();
             if (text) {
                 this.leftMenu.panelSearch.setFindText(text);
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 84be46512..a9a17a479 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -66,7 +66,8 @@ define([
                     'file:show': _.bind(this.fileShowHide, this, true),
                     'file:hide': _.bind(this.fileShowHide, this, false),
                     'comments:show': _.bind(this.commentsShowHide, this, true),
-                    'comments:hide': _.bind(this.commentsShowHide, this, false)
+                    'comments:hide': _.bind(this.commentsShowHide, this, false),
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 },
                 'Common.Views.About': {
                     'show':    _.bind(this.aboutShowHide, this, true),
@@ -1019,6 +1020,11 @@ define([
         },
 
         onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
             var text = findText || this.api.asc_GetSelectedText();
             if (text) {
                 this.leftMenu.panelSearch.setFindText(text);

From 4c4e478007a1af0db52afd115c1e3cb5f947679b Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 11 Mar 2022 15:28:57 +0300
Subject: [PATCH 22/52] [DE] Make new search: add methods for results, fix
 scrolling

---
 .../main/lib/template/SearchPanel.template    |  4 +-
 apps/common/main/lib/view/SearchPanel.js      | 20 +++++++++
 apps/common/main/resources/less/common.less   |  4 ++
 .../main/resources/less/searchdialog.less     | 31 ++++++++++++-
 .../main/app/controller/Main.js               |  5 +--
 .../main/app/controller/Search.js             | 44 +++++++++++++++++++
 6 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 18731d4cd..86da97ea2 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -52,11 +52,11 @@
                     <td class="padding-small"><div id="search-adv-use-regexp"></div></td>
                 </tr>
                 <tr>
-                    <td class="padding-small"><div id="search-adv-match-word"></div></td>
+                    <td class="padding-large"><div id="search-adv-match-word"></div></td>
                 </tr>
             </tbody>
         </table>
     </div>
-    <div id="search-results">
+    <div id="search-results" class="ps-container oo">
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index ed4038090..9715b8cf1 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -57,6 +57,7 @@ define([
         },
 
         render: function(el) {
+            var me = this;
             if (!this.rendered) {
                 el = el || this.el;
                 $(el).html(this.template({
@@ -145,6 +146,21 @@ define([
                 });
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
 
+                this.$resultsContainer = $('#search-results');
+                this.$resultsContainer.hide();
+
+                this.$resultsContainer.scroller = new Common.UI.Scroller({
+                    el: this.$resultsContainer,
+                    includePadding: true,
+                    useKeyboard: true,
+                    minScrollbarLength: 40,
+                    alwaysVisibleY: true
+                });
+                Common.NotificationCenter.on('window:resize', function() {
+                    me.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+                    me.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                });
+
                 if (window.SSE) {
                     this.cmbWithin = new Common.UI.ComboBox({
                         el: $('#search-adv-cmb-within'),
@@ -203,6 +219,10 @@ define([
 
         show: function () {
             Common.UI.BaseView.prototype.show.call(this,arguments);
+
+            this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+
             this.fireEvent('show', this );
         },
 
diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index 15f2deb5b..2b1af4459 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -91,6 +91,10 @@ label {
     #left-panel-comments {
         height: 100%;
     }
+
+    #left-panel-search {
+        height: 100%;
+    }
 }
 
 .right-panel {
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index e1606b081..1f38d294c 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -104,13 +104,21 @@
 }
 
 .search-panel {
+    display: table;
     position: relative;
     border-collapse: collapse;
     line-height: 15px;
 
+    > div {
+        display: table-row;
+    }
+
     #search-header {
-        position: relative;
+        position: absolute;
         height: 45px;
+        left: 0;
+        top: 0;
+        right: 0;
         padding: 12px;
         overflow: hidden;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
@@ -128,6 +136,10 @@
     }
 
     #search-adv-settings {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 45px;
         padding: 10px 15px 0 15px;
 
         table {
@@ -192,4 +204,21 @@
         }
     }
 
+    #search-results {
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        width: 100%;
+        border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
+        border-top: @scaled-one-px-value solid @border-toolbar;
+        padding: 12px 0;
+        overflow: hidden;
+
+        .item {
+            padding: 6px 15px;
+            word-break: break-all;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 633cdf77e..898603a00 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1195,8 +1195,7 @@ define([
                     leftmenuController          = application.getController('LeftMenu'),
                     chatController              = application.getController('Common.Controllers.Chat'),
                     pluginsController           = application.getController('Common.Controllers.Plugins'),
-                    navigationController        = application.getController('Navigation'),
-                    searchController            = application.getController('Search');
+                    navigationController        = application.getController('Navigation');
 
 
                 leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document});
@@ -1221,8 +1220,6 @@ define([
 
                 documentHolderController.getView().setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me));
 
-                searchController.setApi(me.api);
-
                 if (me.appOptions.isEdit) {
                     if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
                         me.appOptions.forcesave = Common.localStorage.getBool("de-settings-forcesave", me.appOptions.canForcesave);
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 620cc35e8..c45152321 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -78,6 +78,9 @@ define([
             if (api) {
                 this.api = api;
                 this.api.asc_registerCallback('asc_onSetSearchCurrent', _.bind(this.onUpdateSearchCurrent, this));
+                this.api.asc_registerCallback('asc_onStartTextAroundSearch', _.bind(this.onStartTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this));
             }
             return this;
         },
@@ -89,6 +92,8 @@ define([
 
         onQuerySearch: function (d, w, opts) {
             if (opts.textsearch && opts.textsearch.length) {
+                this.hideResults();
+
                 var searchSettings = new AscCommon.CSearchSettings();
                 searchSettings.put_Text(opts.textsearch);
                 searchSettings.put_MatchCase(opts.matchcase);
@@ -102,12 +107,16 @@ define([
                             //me.dlgSearch.focus();
                         }
                     });
+                } else {
+                    this.api.asc_StartTextAroundSearch();
                 }
             }
         },
 
         onQueryReplace: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
+                this.hideResults();
+
                 var searchSettings = new AscCommon.CSearchSettings();
                 searchSettings.put_Text(opts.textsearch);
                 searchSettings.put_MatchCase(opts.matchcase);
@@ -121,12 +130,16 @@ define([
                             me.view.focus();
                         }
                     });
+                } else {
+                    this.api.asc_StartTextAroundSearch();
                 }
             }
         },
 
         onQueryReplaceAll: function(w, opts) {
             if (!_.isEmpty(opts.textsearch)) {
+                this.hideResults();
+
                 var searchSettings = new AscCommon.CSearchSettings();
                 searchSettings.put_Text(opts.textsearch);
                 searchSettings.put_MatchCase(opts.matchcase);
@@ -141,6 +154,37 @@ define([
             }
         },
 
+        onStartTextAroundSearch: function () {
+            if (this.view) {
+                this.view.$resultsContainer.show();
+                this._state.isStartedAddingResults = true;
+            }
+        },
+
+        onEndTextAroundSearch: function () {
+            if (this.view) {
+                this._state.isStartedAddingResults = false;
+                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            }
+        },
+
+        onApiGetTextAroundSearch: function (data) {
+            if (this.view && this._state.isStartedAddingResults) {
+                var me = this;
+                data.forEach(function (item) {
+                    var el = '<div class="item">' + item[1].trim() + '</div>';
+                    me.view.$resultsContainer.append(el);
+                });
+            }
+        },
+
+        hideResults: function () {
+            if (this.view) {
+                this.view.$resultsContainer.hide();
+                this.view.$resultsContainer.empty();
+            }
+        },
+
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
 
     }, DE.Controllers.Search || {}));

From c56c0b47be3f984c439baeb9c5da13c244ac08d6 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 14 Mar 2022 21:22:14 +0300
Subject: [PATCH 23/52] [DE PE] Make new search: add nav buttons disabling

---
 apps/common/main/lib/view/SearchBar.js               | 12 ++++++++++++
 apps/common/main/lib/view/SearchPanel.js             |  9 +++++++++
 apps/documenteditor/main/app/controller/LeftMenu.js  |  1 +
 apps/documenteditor/main/app/controller/Search.js    |  1 +
 apps/documenteditor/main/app/view/LeftMenu.js        |  2 +-
 .../main/app/controller/LeftMenu.js                  |  1 +
 .../presentationeditor/main/app/controller/Search.js |  1 +
 apps/presentationeditor/main/app/view/LeftMenu.js    |  2 +-
 8 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index c9f695f4c..4e00db634 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -80,6 +80,9 @@ define([
             Common.UI.Window.prototype.render.call(this);
 
             this.inputSearch = this.$window.find('#search-bar-text');
+            this.inputSearch.on('input', _.bind(function () {
+                this.disableNavButtons();
+            }, this));
 
             this.btnBack = new Common.UI.Button({
                 parentEl: $('#search-bar-back'),
@@ -113,6 +116,8 @@ define([
 
             this.on('animate:before', _.bind(this.focus, this));
 
+            Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
+
             return this;
         },
 
@@ -127,6 +132,7 @@ define([
                 this.inputSearch.val('');
             }
 
+            this.disableNavButtons();
             this.focus();
         },
 
@@ -167,6 +173,12 @@ define([
             this.fireEvent('search:show', [true, this.inputSearch.val()]);
         },
 
+        disableNavButtons: function (resultNumber, allResults) {
+            var disable = this.inputSearch.val() === '';
+            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnNext.setDisabled(disable);
+        },
+
         textFind: 'Find'
 
     }, Common.UI.SearchBar || {}));
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 9715b8cf1..239b9662b 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -72,6 +72,7 @@ define([
                     validateOnBlur: false,
                     style: 'width: 100%;'
                 });
+                this.inputText._input.on('input', _.bind(this.disableNavButtons, this));
 
                 this.inputReplace = new Common.UI.InputField({
                     el: $('#search-adv-replace-text'),
@@ -161,6 +162,7 @@ define([
                     me.$resultsContainer.scroller.update({alwaysVisibleY: true});
                 });
 
+                Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
                 if (window.SSE) {
                     this.cmbWithin = new Common.UI.ComboBox({
                         el: $('#search-adv-cmb-within'),
@@ -223,6 +225,7 @@ define([
             this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
             this.$resultsContainer.scroller.update({alwaysVisibleY: true});
 
+            this.disableNavButtons();
             this.fireEvent('show', this );
         },
 
@@ -302,6 +305,12 @@ define([
             this.updateResultsNumber('no-results');
         },
 
+        disableNavButtons: function (resultNumber, allResults) {
+            var disable = this.inputText._input.val() === '';
+            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnNext.setDisabled(disable);
+        },
+
         textFind: 'Find',
         textFindAndReplace: 'Find and replace',
         textCloseSearch: 'Close search',
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 5f30ed3e7..3a6bb4e66 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -968,6 +968,7 @@ define([
             } else if (text !== undefined) {
                 this.leftMenu.panelSearch.setFindText('');
             }
+            this.leftMenu.panelSearch.disableNavButtons();
             this.leftMenu.panelSearch.focus();
         },
 
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index c45152321..ee0b601af 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -152,6 +152,7 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
             }
+            Common.NotificationCenter.trigger('search:updateresults', current, all);
         },
 
         onStartTextAroundSearch: function () {
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index f2e08d19f..2206c2590 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -271,7 +271,6 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
-                    this.fireEvent('search:aftershow', this);
                 } else {
                     this.panelSearch.hide();
                 }
@@ -418,6 +417,7 @@ define([
                         this.btnSearchBar.toggle(true);
                         this.onBtnMenuClick(this.btnSearchBar);
                         this.onCoauthOptions();
+                        this.fireEvent('search:aftershow', this);
                     }
                 }
                 /** coauthoring end **/
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index a2538ec14..bb96924ee 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -823,6 +823,7 @@ define([
             } else if (text !== undefined) {
                 this.leftMenu.panelSearch.setFindText('');
             }
+            this.leftMenu.panelSearch.disableNavButtons();
             this.leftMenu.panelSearch.focus();
         },
 
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index b170b4901..67c9d9734 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -139,6 +139,7 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
             }
+            Common.NotificationCenter.trigger('search:updateresults', current, all);
         },
 
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index f3b8f98aa..912d430a4 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -255,7 +255,6 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
-                    this.fireEvent('search:aftershow', this);
                 } else {
                     this.panelSearch.hide();
                 }
@@ -375,6 +374,7 @@ define([
                         this.btnSearchBar.toggle(true);
                         this.onBtnMenuClick(this.btnSearchBar);
                         this.onCoauthOptions();
+                        this.fireEvent('search:aftershow', this);
                     }
                 }
                 /** coauthoring end **/

From e7cc5fa1055b904f8760a4a74fa83741175792c9 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 16 Mar 2022 22:06:42 +0300
Subject: [PATCH 24/52] [DE] New search: make auto search

---
 apps/common/main/lib/view/SearchBar.js        |  17 +-
 apps/common/main/lib/view/SearchPanel.js      |  45 +++--
 .../main/resources/less/searchdialog.less     |  11 ++
 .../main/app/controller/LeftMenu.js           |  23 +--
 .../main/app/controller/Search.js             | 183 +++++++++++++-----
 apps/documenteditor/main/app/view/LeftMenu.js |   4 +-
 6 files changed, 183 insertions(+), 100 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 4e00db634..abe7d33a6 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -82,6 +82,9 @@ define([
             this.inputSearch = this.$window.find('#search-bar-text');
             this.inputSearch.on('input', _.bind(function () {
                 this.disableNavButtons();
+                this.fireEvent('search:input', [this.inputSearch.val()]);
+            }, this)).on('keydown', _.bind(function (e) {
+                this.fireEvent('search:keydown', [this.inputSearch.val(), e]);
             }, this));
 
             this.btnBack = new Common.UI.Button({
@@ -89,14 +92,14 @@ define([
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon btn-arrow-up'
             });
-            this.btnBack.on('click', _.bind(this.onBtnClick, this, 'back'));
+            this.btnBack.on('click', _.bind(this.onBtnNextClick, this, 'back'));
 
             this.btnNext = new Common.UI.Button({
                 parentEl: $('#search-bar-next'),
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon btn-arrow-down'
             });
-            this.btnNext.on('click', _.bind(this.onBtnClick, this, 'next'));
+            this.btnNext.on('click', _.bind(this.onBtnNextClick, this, 'next'));
 
             this.btnOpenPanel = new Common.UI.Button({
                 parentEl: $('#search-bar-open-panel'),
@@ -160,12 +163,8 @@ define([
             this.$window.css({left: left, top: top});
         },
 
-        onBtnClick: function(action, event) {
-            if ( $('.asc-loadmask').length ) return;
-            var opts = {
-                textsearch  : this.inputSearch.val()
-            };
-            this.fireEvent('search:'+action, [this, opts, false]);
+        onBtnNextClick: function(action) {
+            this.fireEvent('search:'+action, [this.inputSearch.val(), false]);
         },
 
         onOpenPanel: function () {
@@ -176,7 +175,7 @@ define([
         disableNavButtons: function (resultNumber, allResults) {
             var disable = this.inputSearch.val() === '';
             this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
-            this.btnNext.setDisabled(disable);
+            this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
         },
 
         textFind: 'Find'
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 239b9662b..759acbed8 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -72,7 +72,12 @@ define([
                     validateOnBlur: false,
                     style: 'width: 100%;'
                 });
-                this.inputText._input.on('input', _.bind(this.disableNavButtons, this));
+                this.inputText._input.on('input', _.bind(function () {
+                    this.disableNavButtons();
+                    this.fireEvent('search:input', [this.inputText._input.val()]);
+                }, this)).on('keydown', _.bind(function (e) {
+                    this.fireEvent('search:keydown', [this.inputText._input.val(), e]);
+                }, this));
 
                 this.inputReplace = new Common.UI.InputField({
                     el: $('#search-adv-replace-text'),
@@ -92,7 +97,7 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
-                this.btnBack.on('click', _.bind(this.onBtnClick, this, 'next'));
+                this.btnBack.on('click', _.bind(this.onBtnNextClick, this, 'back'));
 
                 this.btnNext = new Common.UI.Button({
                     parentEl: $('#search-adv-next'),
@@ -101,17 +106,17 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
-                this.btnNext.on('click', _.bind(this.onBtnClick, this, 'next'));
+                this.btnNext.on('click', _.bind(this.onBtnNextClick, this, 'next'));
 
                 this.btnReplace = new Common.UI.Button({
                     el: $('#search-adv-replace')
                 });
-                this.btnReplace.on('click', _.bind(this.onBtnClick, this, 'replace'));
+                this.btnReplace.on('click', _.bind(this.onReplaceClick, this, 'replace'));
 
                 this.btnReplaceAll = new Common.UI.Button({
                     el: $('#search-adv-replace-all')
                 });
-                this.btnReplaceAll.on('click', _.bind(this.onBtnClick, this, 'replaceall'));
+                this.btnReplaceAll.on('click', _.bind(this.onReplaceClick, this, 'replaceall'));
 
                 this.chCaseSensitive = new Common.UI.CheckBox({
                     el: $('#search-adv-case-sensitive'),
@@ -120,6 +125,8 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
+                }).on('change', function(field) {
+                    me.fireEvent('search:options', ['case-sensitive', field.getValue() === 'checked']);
                 });
 
                 this.chUseRegExp = new Common.UI.CheckBox({
@@ -128,6 +135,8 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
+                }).on('change', function(field) {
+                    me.fireEvent('search:options', ['regexp', field.getValue() === 'checked']);
                 });
 
                 this.chMatchWord = new Common.UI.CheckBox({
@@ -137,6 +146,8 @@ define([
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
+                }).on('change', function(field) {
+                    me.fireEvent('search:options', ['match-word', field.getValue() === 'checked']);
                 });
 
                 this.buttonClose = new Common.UI.Button({
@@ -222,11 +233,11 @@ define([
         show: function () {
             Common.UI.BaseView.prototype.show.call(this,arguments);
 
-            this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
-            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
-
             this.disableNavButtons();
             this.fireEvent('show', this );
+
+            this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
         },
 
         hide: function () {
@@ -263,16 +274,12 @@ define([
             Common.NotificationCenter.trigger('leftmenu:change', 'hide');
         },
 
-        onBtnClick: function(action) {
-            var opts = {
-                textsearch  : this.inputText.getValue(),
-                textreplace : this.inputReplace.getValue(),
-                matchcase   : this.chCaseSensitive.checked,
-                useregexp   : this.chUseRegExp.checked,
-                matchword   : this.chMatchWord && this.chMatchWord.checked,
-                //highlight   : this.miHighlight.checked
-            };
-            this.fireEvent('search:'+action, [this, opts, true]);
+        onBtnNextClick: function (action) {
+            this.fireEvent('search:'+action, [this.inputText.getValue(), true]);
+        },
+
+        onReplaceClick: function (action) {
+            this.fireEvent('search:'+action, [this.inputText.getValue(), this.inputReplace.getValue()]);
         },
 
         getSettings: function() {
@@ -308,7 +315,7 @@ define([
         disableNavButtons: function (resultNumber, allResults) {
             var disable = this.inputText._input.val() === '';
             this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
-            this.btnNext.setDisabled(disable);
+            this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
         },
 
         textFind: 'Find',
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 1f38d294c..f69fbb094 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -218,6 +218,17 @@
         .item {
             padding: 6px 15px;
             word-break: break-all;
+
+            &:hover {
+                background-color: @highlight-button-hover-ie;
+                background-color: @highlight-button-hover;
+            }
+            &.selected {
+                background-color: @highlight-button-pressed-ie;
+                background-color: @highlight-button-pressed;
+                color: @text-normal-pressed-ie;
+                color: @text-normal-pressed;
+            }
         }
     }
 
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 3a6bb4e66..aa69bea71 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -80,8 +80,7 @@ define([
                 },
                 'LeftMenu': {
                     'comments:show': _.bind(this.commentsShowHide, this, 'show'),
-                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide'),
-                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
                 },
                 'FileMenu': {
                     'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
@@ -948,30 +947,14 @@ define([
         onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
-                this.leftMenu.showMenu('advancedsearch');
-                this.onShowAfterSearch(findText);
+                this.leftMenu.showMenu('advancedsearch', undefined, true);
+                this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
-        onShowAfterSearch: function (findText) {
-            var viewport = this.getApplication().getController('Viewport');
-            if (viewport.isSearchBarVisible()) {
-                viewport.searchBar.hide();
-            }
-
-            var text = findText || this.api.asc_GetSelectedText();
-            if (text) {
-                this.leftMenu.panelSearch.setFindText(text);
-            } else if (text !== undefined) {
-                this.leftMenu.panelSearch.setFindText('');
-            }
-            this.leftMenu.panelSearch.disableNavButtons();
-            this.leftMenu.panelSearch.focus();
-        },
-
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index ee0b601af..67ca7d4f3 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -55,19 +55,32 @@ define([
         initialize: function () {
             this.addListeners({
                 'SearchBar': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
                 },
                 'Common.Views.SearchPanel': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
                     'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:options': _.bind(this.onChangeSearchOption, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
+                },
+                'LeftMenu': {
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 }
             });
         },
         onLaunch: function () {
-            this._state = {};
+            this._state = {
+                searchText: '',
+                matchCase: false,
+                matchWord: false,
+                useRegExp: false
+            };
         },
 
         setMode: function (mode) {
@@ -81,6 +94,7 @@ define([
                 this.api.asc_registerCallback('asc_onStartTextAroundSearch', _.bind(this.onStartTextAroundSearch, this));
                 this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this));
                 this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this));
             }
             return this;
         },
@@ -90,61 +104,89 @@ define([
                 this.view : Backbone.Controller.prototype.getView.call(this, name);
         },
 
-        onQuerySearch: function (d, w, opts) {
-            if (opts.textsearch && opts.textsearch.length) {
-                this.hideResults();
+        onChangeSearchOption: function (option, checked) {
+            switch (option) {
+                case 'case-sensitive':
+                    this._state.matchCase = checked;
+                    break;
+                case 'match-word':
+                    this._state.matchWord = checked;
+                    break;
+                case 'regexp':
+                    this._state.useRegExp = checked;
+                    break;
+            }
+        },
 
-                var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                if (!this.api.asc_findText(searchSettings, d != 'back')) {
-                    var me = this;
-                    me.view.updateResultsNumber(undefined, 0);
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            //me.dlgSearch.focus();
-                        }
-                    });
-                } else {
-                    this.api.asc_StartTextAroundSearch();
+        onSearchNext: function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+                this._state.searchText = text;
+                if (this.onQuerySearch(type) && this.searchTimer) {
+                    this.hideResults();
+                    clearInterval(this.searchTimer);
+                    this.searchTimer = undefined;
+                    if (this.view.$el.is(':visible')) {
+                        this.api.asc_StartTextAroundSearch();
+                    }
                 }
             }
         },
 
-        onQueryReplace: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                this.hideResults();
+        onInputSearchChange: function (text) {
+            var me = this;
+            if (text.length > 0 && this._state.searchText !== text) {
+                this._state.newSearchText = text;
+                this._lastInputChange = (new Date());
+                if (this.searchTimer === undefined) {
+                    this.searchTimer = setInterval(function(){
+                        if ((new Date()) - me._lastInputChange < 400) return;
 
-                var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                if (!this.api.asc_replaceText(searchSettings, opts.textreplace, false)) {
-                    var me = this;
-                    me.view.updateResultsNumber(undefined, 0);
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.view.focus();
+                        me.hideResults();
+                        me._state.searchText = me._state.newSearchText;
+                        if (me.onQuerySearch() && me.view.$el.is(':visible')) {
+                            me.api.asc_StartTextAroundSearch();
                         }
-                    });
-                } else {
-                    this.api.asc_StartTextAroundSearch();
+                        clearInterval(me.searchTimer);
+                        me.searchTimer = undefined;
+                    }, 10);
                 }
             }
         },
 
-        onQueryReplaceAll: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                this.hideResults();
+        onQuerySearch: function (d, w) {
+            var searchSettings = new AscCommon.CSearchSettings();
+            searchSettings.put_Text(this._state.searchText);
+            searchSettings.put_MatchCase(this._state.matchCase);
+            searchSettings.put_WholeWords(this._state.matchWord);
+            if (!this.api.asc_findText(searchSettings, d != 'back')) {
+                this.view.updateResultsNumber(undefined, 0);
+                return false;
+            }
+            return true;
+        },
 
+        onQueryReplace: function(textSearch, textReplace) {
+            if (textSearch !== '') {
                 var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                this.api.asc_replaceText(searchSettings, opts.textreplace, true);
+                searchSettings.put_Text(textSearch);
+                searchSettings.put_MatchCase(this._state.matchCase);
+                searchSettings.put_WholeWords(this._state.matchWord);
+                if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
+                    this.view.updateResultsNumber(undefined, 0);
+                }
+            }
+        },
+
+        onQueryReplaceAll: function(textSearch, textReplace) {
+            if (textSearch !== '') {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(textSearch);
+                searchSettings.put_MatchCase(this._state.matchCase);
+                searchSettings.put_WholeWords(this._state.matchWord);
+                this.api.asc_replaceText(searchSettings, textReplace, true);
+
+                this.hideResults();
+                this.resultItems.length = 0;
             }
         },
 
@@ -172,13 +214,34 @@ define([
         onApiGetTextAroundSearch: function (data) {
             if (this.view && this._state.isStartedAddingResults) {
                 var me = this;
+                me.resultItems = [];
                 data.forEach(function (item) {
-                    var el = '<div class="item">' + item[1].trim() + '</div>';
+                    var el = document.createElement("div");
+                    el.className = 'item';
+                    el.innerHTML = item[1].trim();
                     me.view.$resultsContainer.append(el);
+                    me.resultItems.push({id: item[0], $el: $(el)});
+                    $(el).on('click', _.bind(function (el) {
+                        var id = item[0];
+                        me.api.asc_SelectSearchElement(id);
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(el.currentTarget).addClass('selected');
+                    }, me));
                 });
             }
         },
 
+        onApiRemoveTextAroundSearch: function (arr) {
+            var me = this;
+            arr.forEach(function (id) {
+                var ind = _.findIndex(me.resultItems, {id: id});
+                if (ind !== -1) {
+                    me.resultItems[ind].$el.remove();
+                    me.resultItems.splice(ind, 1);
+                }
+            });
+        },
+
         hideResults: function () {
             if (this.view) {
                 this.view.$resultsContainer.hide();
@@ -186,7 +249,27 @@ define([
             }
         },
 
-        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
+        onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
+            var text = findText || this.api.asc_GetSelectedText();
+            if (text) {
+                this.view.setFindText(text);
+            } else if (text !== undefined) {
+                this.view.setFindText('');
+            }
+
+            if (text !== '' && text === this._state.searchText) {
+                this.hideResults();
+                this.api.asc_StartTextAroundSearch();
+            }
+
+            this.view.disableNavButtons();
+            this.view.focus();
+        },
 
     }, DE.Controllers.Search || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 2206c2590..a7ae48bdb 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -379,7 +379,7 @@ define([
             this.btnThumbnails.setDisabled(false);
         },
 
-        showMenu: function(menu, opts) {
+        showMenu: function(menu, opts, suspendAfter) {
             var re = /^(\w+):?(\w*)$/.exec(menu);
             if ( re[1] == 'file' ) {
                 if ( !this.menuFile.isVisible() ) {
@@ -417,7 +417,7 @@ define([
                         this.btnSearchBar.toggle(true);
                         this.onBtnMenuClick(this.btnSearchBar);
                         this.onCoauthOptions();
-                        this.fireEvent('search:aftershow', this);
+                        !suspendAfter && this.fireEvent('search:aftershow', this);
                     }
                 }
                 /** coauthoring end **/

From 0cc9581c6d6b8d193c5613fe2f90ef9d9822b350 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 18 Mar 2022 19:18:11 +0300
Subject: [PATCH 25/52] [DE] Make new search: add disabling of buttons, fix
 updating of current result number, fix styles

---
 apps/common/main/lib/view/SearchPanel.js      | 17 +++++++++++---
 .../main/resources/less/searchdialog.less     |  7 ++++++
 .../main/app/controller/Search.js             | 23 +++++++++++++++----
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 759acbed8..e29c297c5 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -266,7 +266,12 @@ define([
         },
 
         updateResultsNumber: function (current, count) {
-            var text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
+            var text;
+            if (count > 300) {
+                text = this.textTooManyResults;
+            } else {
+                text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
+            }
             this.$reaultsNumber.text(text);
         },
 
@@ -315,7 +320,12 @@ define([
         disableNavButtons: function (resultNumber, allResults) {
             var disable = this.inputText._input.val() === '';
             this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
-            this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
+            this.btnNext.setDisabled(disable || !allResults || resultNumber + 1 === allResults);
+        },
+
+        disableReplaceButtons: function (disable) {
+            this.btnReplace.setDisabled(disable);
+            this.btnReplaceAll.setDisabled(disable);
         },
 
         textFind: 'Find',
@@ -340,7 +350,8 @@ define([
         textSearchOptions: 'Search options',
         textNoMatches: 'No matches',
         textNoSearchResults: 'No search results',
-        textItemEntireCell: 'Entire cell contents'
+        textItemEntireCell: 'Entire cell contents',
+        textTooManyResults: 'There are too many results to show here'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index f69fbb094..d4de49286 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -156,6 +156,9 @@
 
         #search-adv-results-number {
             padding-top: 2px;
+            width: calc(100% - 48px);
+            color: @text-secondary-ie;
+            color: @text-secondary;
         }
     }
 
@@ -229,6 +232,10 @@
                 color: @text-normal-pressed-ie;
                 color: @text-normal-pressed;
             }
+
+            b {
+                font-style: italic;
+            }
         }
     }
 
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 67ca7d4f3..0dca0cef6 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -134,7 +134,7 @@ define([
 
         onInputSearchChange: function (text) {
             var me = this;
-            if (text.length > 0 && this._state.searchText !== text) {
+            if (this._state.searchText !== text) {
                 this._state.newSearchText = text;
                 this._lastInputChange = (new Date());
                 if (this.searchTimer === undefined) {
@@ -143,8 +143,14 @@ define([
 
                         me.hideResults();
                         me._state.searchText = me._state.newSearchText;
-                        if (me.onQuerySearch() && me.view.$el.is(':visible')) {
-                            me.api.asc_StartTextAroundSearch();
+                        if (me._state.newSearchText !== '' && me.onQuerySearch()) {
+                            if (me.view.$el.is(':visible')) {
+                                me.api.asc_StartTextAroundSearch();
+                            }
+                            me.view.disableReplaceButtons(false);
+                        } else if (me._state.newSearchText === '') {
+                            me.view.updateResultsNumber('no-results');
+                            me.view.disableReplaceButtons(true);
                         }
                         clearInterval(me.searchTimer);
                         me.searchTimer = undefined;
@@ -160,6 +166,7 @@ define([
             searchSettings.put_WholeWords(this._state.matchWord);
             if (!this.api.asc_findText(searchSettings, d != 'back')) {
                 this.view.updateResultsNumber(undefined, 0);
+                this.view.disableReplaceButtons(true);
                 return false;
             }
             return true;
@@ -173,6 +180,7 @@ define([
                 searchSettings.put_WholeWords(this._state.matchWord);
                 if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
                     this.view.updateResultsNumber(undefined, 0);
+                    this.view.disableReplaceButtons(true);
                 }
             }
         },
@@ -199,7 +207,6 @@ define([
 
         onStartTextAroundSearch: function () {
             if (this.view) {
-                this.view.$resultsContainer.show();
                 this._state.isStartedAddingResults = true;
             }
         },
@@ -213,6 +220,7 @@ define([
 
         onApiGetTextAroundSearch: function (data) {
             if (this.view && this._state.isStartedAddingResults) {
+                if (data.length > 300) return;
                 var me = this;
                 me.resultItems = [];
                 data.forEach(function (item) {
@@ -228,6 +236,8 @@ define([
                         $(el.currentTarget).addClass('selected');
                     }, me));
                 });
+
+                this.view.$resultsContainer.show();
             }
         },
 
@@ -262,9 +272,12 @@ define([
                 this.view.setFindText('');
             }
 
-            if (text !== '' && text === this._state.searchText) {
+            if (text !== '' && text === this._state.searchText) { // search was made
+                this.view.disableReplaceButtons(false);
                 this.hideResults();
                 this.api.asc_StartTextAroundSearch();
+            } else {
+                this.view.disableReplaceButtons(true);
             }
 
             this.view.disableNavButtons();

From 25b48c032e3421eeaa21728ec72b4e64564d6b22 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 21 Mar 2022 20:39:25 +0300
Subject: [PATCH 26/52] [DE] For bug 56026

---
 .../main/app/controller/Search.js             | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 0dca0cef6..32c0438c8 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -174,6 +174,20 @@ define([
 
         onQueryReplace: function(textSearch, textReplace) {
             if (textSearch !== '') {
+                var me = this;
+                var str = this.api.asc_GetErrorForReplaceString(textReplace);
+                if (str) {
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: Common.Utils.String.format(this.warnReplaceString, str),
+                        buttons: ['ok'],
+                        callback: function(){
+                            me.view.focus('replace');
+                        }
+                    });
+                    return;
+                }
+
                 var searchSettings = new AscCommon.CSearchSettings();
                 searchSettings.put_Text(textSearch);
                 searchSettings.put_MatchCase(this._state.matchCase);
@@ -187,6 +201,20 @@ define([
 
         onQueryReplaceAll: function(textSearch, textReplace) {
             if (textSearch !== '') {
+                var me = this;
+                var str = this.api.asc_GetErrorForReplaceString(textReplace);
+                if (str) {
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: Common.Utils.String.format(this.warnReplaceString, str),
+                        buttons: ['ok'],
+                        callback: function(){
+                            me.view.focus('replace');
+                        }
+                    });
+                    return;
+                }
+
                 var searchSettings = new AscCommon.CSearchSettings();
                 searchSettings.put_Text(textSearch);
                 searchSettings.put_MatchCase(this._state.matchCase);
@@ -284,5 +312,8 @@ define([
             this.view.focus();
         },
 
+        notcriticalErrorTitle: 'Warning',
+        warnReplaceString: '{0} is not a valid special character for the Replace With box.'
+
     }, DE.Controllers.Search || {}));
 });
\ No newline at end of file

From c64539f2ab06f6d1916caf2060467800bdaab25b Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 22 Mar 2022 21:41:18 +0300
Subject: [PATCH 27/52] [DE] Fix auto search in left panel, fix search results

---
 apps/common/main/lib/view/SearchPanel.js      |  4 +-
 .../main/app/controller/LeftMenu.js           |  5 +-
 .../main/app/controller/Search.js             | 47 ++++++++++++++++---
 apps/documenteditor/main/app/view/LeftMenu.js |  7 ++-
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index e29c297c5..caf9e3943 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -73,7 +73,6 @@ define([
                     style: 'width: 100%;'
                 });
                 this.inputText._input.on('input', _.bind(function () {
-                    this.disableNavButtons();
                     this.fireEvent('search:input', [this.inputText._input.val()]);
                 }, this)).on('keydown', _.bind(function (e) {
                     this.fireEvent('search:keydown', [this.inputText._input.val(), e]);
@@ -232,8 +231,6 @@ define([
 
         show: function () {
             Common.UI.BaseView.prototype.show.call(this,arguments);
-
-            this.disableNavButtons();
             this.fireEvent('show', this );
 
             this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
@@ -277,6 +274,7 @@ define([
 
         onClickClosePanel: function() {
             Common.NotificationCenter.trigger('leftmenu:change', 'hide');
+            this.fireEvent('hide', this );
         },
 
         onBtnNextClick: function (action) {
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index aa69bea71..e0420c0fc 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -802,7 +802,8 @@ define([
                     var selectedText = this.api.asc_GetSelectedText();
                     if (this.isSearchPanelVisible()) {
                         selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
-                        this.leftMenu.panelSearch.focus(s);
+                        this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
+                        this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
                         return false;
                     } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
                         if (s === 'replace') {
@@ -820,7 +821,7 @@ define([
                         this.onShowHideSearch(true, selectedText);
                     }
                     this.leftMenu.btnSearchBar.toggle(true,true);
-                    this.leftMenu.panelSearch.focus(s);
+                    this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
                     // this.leftMenu.menuFile.hide();
                     return false;
                 case 'save':
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 32c0438c8..d682918f4 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -67,7 +67,9 @@ define([
                     'search:replaceall': _.bind(this.onQueryReplaceAll, this),
                     'search:input': _.bind(this.onInputSearchChange, this),
                     'search:options': _.bind(this.onChangeSearchOption, this),
-                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
+                    'show': _.bind(this.onShowPanel, this),
+                    'hide': _.bind(this.onHidePanel, this),
                 },
                 'LeftMenu': {
                     'search:aftershow': _.bind(this.onShowAfterSearch, this)
@@ -165,8 +167,12 @@ define([
             searchSettings.put_MatchCase(this._state.matchCase);
             searchSettings.put_WholeWords(this._state.matchWord);
             if (!this.api.asc_findText(searchSettings, d != 'back')) {
+                this.resultItems = [];
                 this.view.updateResultsNumber(undefined, 0);
                 this.view.disableReplaceButtons(true);
+                this._state.currentResult = 0;
+                this._state.resultsNumber = 0;
+                this.view.disableNavButtons();
                 return false;
             }
             return true;
@@ -193,8 +199,12 @@ define([
                 searchSettings.put_MatchCase(this._state.matchCase);
                 searchSettings.put_WholeWords(this._state.matchWord);
                 if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
+                    this.resultItems = [];
                     this.view.updateResultsNumber(undefined, 0);
                     this.view.disableReplaceButtons(true);
+                    this._state.currentResult = 0;
+                    this._state.resultsNumber = 0;
+                    this.view.disableNavButtons();
                 }
             }
         },
@@ -222,13 +232,16 @@ define([
                 this.api.asc_replaceText(searchSettings, textReplace, true);
 
                 this.hideResults();
-                this.resultItems.length = 0;
+                this.resultItems = [];
             }
         },
 
         onUpdateSearchCurrent: function (current, all) {
+            this._state.currentResult = current;
+            this._state.resultsNumber = all;
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
+                this.view.disableNavButtons(current, all);
             }
             Common.NotificationCenter.trigger('search:updateresults', current, all);
         },
@@ -256,7 +269,7 @@ define([
                     el.className = 'item';
                     el.innerHTML = item[1].trim();
                     me.view.$resultsContainer.append(el);
-                    me.resultItems.push({id: item[0], $el: $(el)});
+                    me.resultItems.push({id: item[0], $el: $(el), el: el});
                     $(el).on('click', _.bind(function (el) {
                         var id = item[0];
                         me.api.asc_SelectSearchElement(id);
@@ -293,23 +306,43 @@ define([
                 viewport.searchBar.hide();
             }
 
-            var text = findText || this.api.asc_GetSelectedText();
+            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
             if (text) {
                 this.view.setFindText(text);
             } else if (text !== undefined) {
                 this.view.setFindText('');
             }
 
+            this.hideResults();
             if (text !== '' && text === this._state.searchText) { // search was made
                 this.view.disableReplaceButtons(false);
-                this.hideResults();
                 this.api.asc_StartTextAroundSearch();
+            } else if (text !== '') { // search wasn't made
+                this.onInputSearchChange(text);
             } else {
+                this.resultItems = [];
                 this.view.disableReplaceButtons(true);
             }
+            this.view.disableNavButtons(this._state.currentResult, this._state.resultsNumber);
+        },
 
-            this.view.disableNavButtons();
-            this.view.focus();
+        onShowPanel: function () {
+            if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
+                var me = this;
+                this.view.$resultsContainer.show();
+                this.resultItems.forEach(function (item) {
+                    me.view.$resultsContainer.append(item.el);
+                    $(item.el).on('click', function (el) {
+                        me.api.asc_SelectSearchElement(item.id);
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(el.currentTarget).addClass('selected');
+                    });
+                });
+            }
+        },
+
+        onHidePanel: function () {
+            this.hideResults();
         },
 
         notcriticalErrorTitle: 'Warning',
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index a7ae48bdb..7d9bf9644 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -76,7 +76,10 @@ define([
                 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-navigation': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-thumbnails': _.bind(this.onCoauthOptions, this),
-                'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this),
+                'click #left-btn-searchbar': _.bind(function () {
+                    this.onCoauthOptions();
+                    this.fireEvent('search:aftershow', this.leftMenu);
+                }, this),
                 'click #left-btn-support': function() {
                     var config = this.mode.customization;
                     config && !!config.feedback && !!config.feedback.url ?
@@ -271,6 +274,7 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
+                    this.panelSearch.focus();
                 } else {
                     this.panelSearch.hide();
                 }
@@ -417,6 +421,7 @@ define([
                         this.btnSearchBar.toggle(true);
                         this.onBtnMenuClick(this.btnSearchBar);
                         this.onCoauthOptions();
+                        this.panelSearch.focus();
                         !suspendAfter && this.fireEvent('search:aftershow', this);
                     }
                 }

From c10d349a19878ccfd3c01c44e81cbc5dc14220ef Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 23 Mar 2022 16:20:51 +0300
Subject: [PATCH 28/52] [DE PE] Fix new search

---
 apps/common/main/lib/template/SearchPanel.template      | 4 ++--
 apps/common/main/lib/view/SearchPanel.js                | 6 +++---
 apps/documenteditor/main/app/controller/Search.js       | 2 ++
 apps/documenteditor/main/app/controller/Viewport.js     | 1 -
 apps/presentationeditor/main/app/controller/Viewport.js | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 86da97ea2..d40ebdb29 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -48,9 +48,9 @@
                 <tr>
                     <td class="padding-small"><div id="search-adv-case-sensitive"></div></td>
                 </tr>
-                <tr>
+                <!---<tr>
                     <td class="padding-small"><div id="search-adv-use-regexp"></div></td>
-                </tr>
+                </tr>-->
                 <tr>
                     <td class="padding-large"><div id="search-adv-match-word"></div></td>
                 </tr>
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index caf9e3943..71acac950 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -128,7 +128,7 @@ define([
                     me.fireEvent('search:options', ['case-sensitive', field.getValue() === 'checked']);
                 });
 
-                this.chUseRegExp = new Common.UI.CheckBox({
+                /*this.chUseRegExp = new Common.UI.CheckBox({
                     el: $('#search-adv-use-regexp'),
                     labelText: this.textMatchUsingRegExp,
                     dataHint: '1',
@@ -136,7 +136,7 @@ define([
                     dataHintOffset: 'small'
                 }).on('change', function(field) {
                     me.fireEvent('search:options', ['regexp', field.getValue() === 'checked']);
-                });
+                });*/
 
                 this.chMatchWord = new Common.UI.CheckBox({
                     el: $('#search-adv-match-word'),
@@ -311,7 +311,7 @@ define([
             this.inputText.setValue(val);
         },
 
-        clearResults: function () {
+        clearResultsNumber: function () {
             this.updateResultsNumber('no-results');
         },
 
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index d682918f4..c8b85e2fe 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -237,6 +237,7 @@ define([
         },
 
         onUpdateSearchCurrent: function (current, all) {
+            if (current === -1) return;
             this._state.currentResult = current;
             this._state.resultsNumber = all;
             if (this.view) {
@@ -322,6 +323,7 @@ define([
             } else {
                 this.resultItems = [];
                 this.view.disableReplaceButtons(true);
+                this.view.clearResultsNumber();
             }
             this.view.disableNavButtons(this._state.currentResult, this._state.resultsNumber);
         },
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index 9ae5ac5d0..588e27871 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -482,7 +482,6 @@ define([
             }
             if (this.header.btnSearch.pressed) {
                 this.searchBar.show(this.api.asc_GetSelectedText());
-                leftMenu.getView('LeftMenu').panelSearch.clearResults();
             } else {
                 this.searchBar.hide();
             }
diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
index 7e8f3fed2..12ae69ce9 100644
--- a/apps/presentationeditor/main/app/controller/Viewport.js
+++ b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -534,7 +534,6 @@ define([
             }
             if (this.header.btnSearch.pressed) {
                 this.searchBar.show(this.api.asc_GetSelectedText());
-                leftMenu.getView('LeftMenu').panelSearch.clearResults();
             } else {
                 this.searchBar.hide();
             }

From 1ed6a7b83015fe538b10fdd65981d47081328fb1 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 29 Mar 2022 20:49:35 +0300
Subject: [PATCH 29/52] [DE] Fix highlighting of search results

---
 apps/common/main/lib/view/SearchBar.js         |  2 ++
 .../main/app/controller/LeftMenu.js            |  9 +++++----
 .../main/app/controller/Search.js              | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index abe7d33a6..9cdc8b195 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -131,6 +131,7 @@ define([
 
             if (text) {
                 this.inputSearch.val(text);
+                this.fireEvent('search:input', [text]);
             } else {
                 this.inputSearch.val('');
             }
@@ -149,6 +150,7 @@ define([
 
         setText: function (text) {
             this.inputSearch.val(text);
+            this.fireEvent('search:input', [text]);
         },
 
         getSettings: function() {
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index e0420c0fc..2276dedc2 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -806,12 +806,13 @@ define([
                         this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
                         return false;
                     } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                        var viewport = this.getApplication().getController('Viewport');
                         if (s === 'replace') {
-                            this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
-                            this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                            viewport.header.btnSearch.toggle(false);
+                            this.onShowHideSearch(true, viewport.searchBar.inputSearch.val());
                         } else {
-                            selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
-                            this.getApplication().getController('Viewport').searchBar.focus();
+                            selectedText && viewport.searchBar.setText(selectedText);
+                            viewport.searchBar.focus();
                             return false;
                         }
                     } else if (s === 'search') {
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index c8b85e2fe..e215d0289 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -58,7 +58,9 @@ define([
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
                     'search:next': _.bind(this.onSearchNext, this, 'next'),
                     'search:input': _.bind(this.onInputSearchChange, this),
-                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
+                    'show': _.bind(this.onSelectSearchingResults, this, true),
+                    'hide': _.bind(this.onSelectSearchingResults, this, false)
                 },
                 'Common.Views.SearchPanel': {
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
@@ -81,7 +83,8 @@ define([
                 searchText: '',
                 matchCase: false,
                 matchWord: false,
-                useRegExp: false
+                useRegExp: false,
+                isHighlightedResults: false
             };
         },
 
@@ -329,6 +332,7 @@ define([
         },
 
         onShowPanel: function () {
+            this.onSelectSearchingResults(true);
             if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
                 var me = this;
                 this.view.$resultsContainer.show();
@@ -345,6 +349,16 @@ define([
 
         onHidePanel: function () {
             this.hideResults();
+            this.onSelectSearchingResults(false);
+        },
+
+        onSelectSearchingResults: function (val) {
+            if (!val && this.getApplication().getController('LeftMenu').isSearchPanelVisible()) return;
+
+            if (this._state.isHighlightedResults !== val) {
+                this.api.asc_selectSearchingResults(val);
+                this._state.isHighlightedResults = val;
+            }
         },
 
         notcriticalErrorTitle: 'Warning',

From 6f203af1275ff7822c7648377ecc111726168dab Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 30 Mar 2022 21:07:25 +0300
Subject: [PATCH 30/52] [DE] Search: add selection of results by nav buttons

---
 .../main/app/controller/Search.js             | 46 +++++++++++++++++--
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index e215d0289..9568d05f6 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -246,10 +246,38 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
                 this.view.disableNavButtons(current, all);
+                if (this.resultItems.length > 0) {
+                    this.resultItems.forEach(function (item) {
+                        item.selected = false;
+                    });
+                    if (this.resultItems[current]) {
+                        this.resultItems[current].selected = true;
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(this.resultItems[current].el).addClass('selected');
+                        this.scrollToSelectedResult(current);
+                    }
+                }
             }
             Common.NotificationCenter.trigger('search:updateresults', current, all);
         },
 
+        scrollToSelectedResult: function (ind) {
+            var index = ind !== undefined ? ind : _.findIndex(this.resultItems, {selected: true});
+            if (index !== -1) {
+                var item = this.resultItems[index].$el,
+                    itemHeight = item.outerHeight(),
+                    itemTop = item.position().top,
+                    container = this.view.$resultsContainer,
+                    containerHeight = container.outerHeight(),
+                    containerTop = container.scrollTop();
+                if (itemTop < 0 || (containerTop === 0 && itemTop > containerHeight)) {
+                    container.scroller.scrollTop(containerTop + itemTop - 12);
+                } else if (itemTop + itemHeight > containerHeight) {
+                    container.scroller.scrollTop(containerTop + itemHeight);
+                }
+            }
+        },
+
         onStartTextAroundSearch: function () {
             if (this.view) {
                 this._state.isStartedAddingResults = true;
@@ -268,17 +296,21 @@ define([
                 if (data.length > 300) return;
                 var me = this;
                 me.resultItems = [];
-                data.forEach(function (item) {
-                    var el = document.createElement("div");
+                data.forEach(function (item, ind) {
+                    var el = document.createElement("div"),
+                        isSelected = ind === me._state.currentResult;
                     el.className = 'item';
                     el.innerHTML = item[1].trim();
                     me.view.$resultsContainer.append(el);
-                    me.resultItems.push({id: item[0], $el: $(el), el: el});
+                    if (isSelected) {
+                        $(el).addClass('selected');
+                    }
+
+                    var resultItem = {id: item[0], $el: $(el), el: el, selected: isSelected};
+                    me.resultItems.push(resultItem);
                     $(el).on('click', _.bind(function (el) {
                         var id = item[0];
                         me.api.asc_SelectSearchElement(id);
-                        $('#search-results').find('.item').removeClass('selected');
-                        $(el.currentTarget).addClass('selected');
                     }, me));
                 });
 
@@ -338,12 +370,16 @@ define([
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
                     me.view.$resultsContainer.append(item.el);
+                    if (item.selected) {
+                        $(item.el).addClass('selected');
+                    }
                     $(item.el).on('click', function (el) {
                         me.api.asc_SelectSearchElement(item.id);
                         $('#search-results').find('.item').removeClass('selected');
                         $(el.currentTarget).addClass('selected');
                     });
                 });
+                this.scrollToSelectedResult();
             }
         },
 

From 9922a715c0801fffae5fb106089b440c85c9cbde Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 1 Apr 2022 21:20:00 +0300
Subject: [PATCH 31/52] [PE] Add methods for auto search

---
 .../main/app/controller/LeftMenu.js           |  35 +-
 .../main/app/controller/Search.js             | 298 +++++++++++++++---
 .../main/app/view/LeftMenu.js                 |  10 +-
 3 files changed, 273 insertions(+), 70 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index bb96924ee..f8091b677 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -79,8 +79,7 @@ define([
                 'LeftMenu': {
                     'panel:show':    _.bind(this.menuExpand, this),
                     'comments:show': _.bind(this.commentsShowHide, this, 'show'),
-                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide'),
-                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
                 },
                 'FileMenu': {
                     'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
@@ -655,15 +654,17 @@ define([
                         var selectedText = this.api.asc_GetSelectedText();
                         if (this.isSearchPanelVisible()) {
                             selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
-                            this.leftMenu.panelSearch.focus(s);
+                            this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
+                            this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
                             return false;
                         } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                            var viewport = this.getApplication().getController('Viewport');
                             if (s === 'replace') {
-                                this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
-                                this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                                viewport.header.btnSearch.toggle(false);
+                                this.onShowHideSearch(true, viewport.searchBar.inputSearch.val());
                             } else {
-                                selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
-                                this.getApplication().getController('Viewport').searchBar.focus();
+                                selectedText && viewport.searchBar.setText(selectedText);
+                                viewport.searchBar.focus();
                                 return false;
                             }
                         } else if (s === 'search') {
@@ -803,30 +804,14 @@ define([
         onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
-                this.leftMenu.showMenu('advancedsearch');
-                this.onShowAfterSearch(findText);
+                this.leftMenu.showMenu('advancedsearch', undefined, true);
+                this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
-        onShowAfterSearch: function (findText) {
-            var viewport = this.getApplication().getController('Viewport');
-            if (viewport.isSearchBarVisible()) {
-                viewport.searchBar.hide();
-            }
-
-            var text = findText || this.api.asc_GetSelectedText();
-            if (text) {
-                this.leftMenu.panelSearch.setFindText(text);
-            } else if (text !== undefined) {
-                this.leftMenu.panelSearch.setFindText('');
-            }
-            this.leftMenu.panelSearch.disableNavButtons();
-            this.leftMenu.panelSearch.focus();
-        },
-
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 67c9d9734..4b02f1fce 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -55,19 +55,34 @@ define([
         initialize: function () {
             this.addListeners({
                 'SearchBar': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
                 },
                 'Common.Views.SearchPanel': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
                     'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:options': _.bind(this.onChangeSearchOption, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
+                    'show': _.bind(this.onShowPanel, this),
+                    'hide': _.bind(this.onHidePanel, this),
+                },
+                'LeftMenu': {
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 }
             });
         },
         onLaunch: function () {
-            this._state = {};
+            this._state = {
+                searchText: '',
+                matchCase: false,
+                matchWord: false,
+                useRegExp: false
+            };
         },
 
         setMode: function (mode) {
@@ -78,6 +93,10 @@ define([
             if (api) {
                 this.api = api;
                 this.api.asc_registerCallback('asc_onSetSearchCurrent', _.bind(this.onUpdateSearchCurrent, this));
+                this.api.asc_registerCallback('asc_onStartTextAroundSearch', _.bind(this.onStartTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this));
             }
             return this;
         },
@@ -87,62 +106,257 @@ define([
                 this.view : Backbone.Controller.prototype.getView.call(this, name);
         },
 
-        onQuerySearch: function (d, w, opts) {
-            if (opts.textsearch && opts.textsearch.length) {
-                var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                if (!this.api.asc_findText(searchSettings, d != 'back')) {
-                    var me = this;
-                    me.view.updateResultsNumber(undefined, 0);
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            //me.dlgSearch.focus();
-                        }
-                    });
+        onChangeSearchOption: function (option, checked) {
+            switch (option) {
+                case 'case-sensitive':
+                    this._state.matchCase = checked;
+                    break;
+                case 'match-word':
+                    this._state.matchWord = checked;
+                    break;
+                case 'regexp':
+                    this._state.useRegExp = checked;
+                    break;
+            }
+        },
+
+        onSearchNext: function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+                this._state.searchText = text;
+                if (this.onQuerySearch(type) && this.searchTimer) {
+                    this.hideResults();
+                    clearInterval(this.searchTimer);
+                    this.searchTimer = undefined;
+                    if (this.view.$el.is(':visible')) {
+                        this.api.asc_StartTextAroundSearch();
+                    }
                 }
             }
         },
 
-        onQueryReplace: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                if (!this.api.asc_replaceText(searchSettings, opts.textreplace, false)) {
-                    var me = this;
-                    me.view.updateResultsNumber(undefined, 0);
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.view.focus();
+        onInputSearchChange: function (text) {
+            var me = this;
+            if (this._state.searchText !== text) {
+                this._state.newSearchText = text;
+                this._lastInputChange = (new Date());
+                if (this.searchTimer === undefined) {
+                    this.searchTimer = setInterval(function(){
+                        if ((new Date()) - me._lastInputChange < 400) return;
+
+                        me.hideResults();
+                        me._state.searchText = me._state.newSearchText;
+                        if (me._state.newSearchText !== '' && me.onQuerySearch()) {
+                            if (me.view.$el.is(':visible')) {
+                                me.api.asc_StartTextAroundSearch();
+                            }
+                            me.view.disableReplaceButtons(false);
+                        } else if (me._state.newSearchText === '') {
+                            me.view.updateResultsNumber('no-results');
+                            me.view.disableReplaceButtons(true);
                         }
-                    });
+                        clearInterval(me.searchTimer);
+                        me.searchTimer = undefined;
+                    }, 10);
                 }
             }
         },
 
-        onQueryReplaceAll: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
+        onQuerySearch: function (d, w) {
+            var searchSettings = new AscCommon.CSearchSettings();
+            searchSettings.put_Text(this._state.searchText);
+            searchSettings.put_MatchCase(this._state.matchCase);
+            searchSettings.put_WholeWords(this._state.matchWord);
+            if (!this.api.asc_findText(searchSettings, d != 'back')) {
+                this.resultItems = [];
+                this.view.updateResultsNumber(undefined, 0);
+                this.view.disableReplaceButtons(true);
+                this._state.currentResult = 0;
+                this._state.resultsNumber = 0;
+                this.view.disableNavButtons();
+                return false;
+            }
+            return true;
+        },
+
+        onQueryReplace: function(textSearch, textReplace) {
+            if (textSearch !== '') {
                 var searchSettings = new AscCommon.CSearchSettings();
-                searchSettings.put_Text(opts.textsearch);
-                searchSettings.put_MatchCase(opts.matchcase);
-                searchSettings.put_WholeWords(opts.matchword);
-                this.api.asc_replaceText(searchSettings, opts.textreplace, true);
+                searchSettings.put_Text(textSearch);
+                searchSettings.put_MatchCase(this._state.matchCase);
+                searchSettings.put_WholeWords(this._state.matchWord);
+                if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
+                    this.resultItems = [];
+                    this.view.updateResultsNumber(undefined, 0);
+                    this.view.disableReplaceButtons(true);
+                    this._state.currentResult = 0;
+                    this._state.resultsNumber = 0;
+                    this.view.disableNavButtons();
+                }
+            }
+        },
+
+        onQueryReplaceAll: function(textSearch, textReplace) {
+            if (textSearch !== '') {
+                var searchSettings = new AscCommon.CSearchSettings();
+                searchSettings.put_Text(textSearch);
+                searchSettings.put_MatchCase(this._state.matchCase);
+                searchSettings.put_WholeWords(this._state.matchWord);
+                this.api.asc_replaceText(searchSettings, textReplace, true);
+
+                this.hideResults();
+                this.resultItems = [];
             }
         },
 
         onUpdateSearchCurrent: function (current, all) {
+            if (current === -1) return;
+            this._state.currentResult = current;
+            this._state.resultsNumber = all;
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
+                this.view.disableNavButtons(current, all);
+                if (this.resultItems.length > 0) {
+                    this.resultItems.forEach(function (item) {
+                        item.selected = false;
+                    });
+                    if (this.resultItems[current]) {
+                        this.resultItems[current].selected = true;
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(this.resultItems[current].el).addClass('selected');
+                        this.scrollToSelectedResult(current);
+                    }
+                }
             }
             Common.NotificationCenter.trigger('search:updateresults', current, all);
         },
 
-        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
+        scrollToSelectedResult: function (ind) {
+            var index = ind !== undefined ? ind : _.findIndex(this.resultItems, {selected: true});
+            if (index !== -1) {
+                var item = this.resultItems[index].$el,
+                    itemHeight = item.outerHeight(),
+                    itemTop = item.position().top,
+                    container = this.view.$resultsContainer,
+                    containerHeight = container.outerHeight(),
+                    containerTop = container.scrollTop();
+                if (itemTop < 0 || (containerTop === 0 && itemTop > containerHeight)) {
+                    container.scroller.scrollTop(containerTop + itemTop - 12);
+                } else if (itemTop + itemHeight > containerHeight) {
+                    container.scroller.scrollTop(containerTop + itemHeight);
+                }
+            }
+        },
+
+        onStartTextAroundSearch: function () {
+            if (this.view) {
+                this._state.isStartedAddingResults = true;
+            }
+        },
+
+        onEndTextAroundSearch: function () {
+            if (this.view) {
+                this._state.isStartedAddingResults = false;
+                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            }
+        },
+
+        onApiGetTextAroundSearch: function (data) {
+            if (this.view && this._state.isStartedAddingResults) {
+                if (data.length > 300) return;
+                var me = this;
+                me.resultItems = [];
+                data.forEach(function (item, ind) {
+                    var el = document.createElement("div"),
+                        isSelected = ind === me._state.currentResult;
+                    el.className = 'item';
+                    el.innerHTML = item[1].trim();
+                    me.view.$resultsContainer.append(el);
+                    if (isSelected) {
+                        $(el).addClass('selected');
+                    }
+
+                    var resultItem = {id: item[0], $el: $(el), el: el, selected: isSelected};
+                    me.resultItems.push(resultItem);
+                    $(el).on('click', _.bind(function (el) {
+                        var id = item[0];
+                        me.api.asc_SelectSearchElement(id);
+                    }, me));
+                });
+
+                this.view.$resultsContainer.show();
+            }
+        },
+
+        onApiRemoveTextAroundSearch: function (arr) {
+            var me = this;
+            arr.forEach(function (id) {
+                var ind = _.findIndex(me.resultItems, {id: id});
+                if (ind !== -1) {
+                    me.resultItems[ind].$el.remove();
+                    me.resultItems.splice(ind, 1);
+                }
+            });
+        },
+
+        hideResults: function () {
+            if (this.view) {
+                this.view.$resultsContainer.hide();
+                this.view.$resultsContainer.empty();
+            }
+        },
+
+        onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
+            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            if (text) {
+                this.view.setFindText(text);
+            } else if (text !== undefined) {
+                this.view.setFindText('');
+            }
+
+            this.hideResults();
+            if (text !== '' && text === this._state.searchText) { // search was made
+                this.view.disableReplaceButtons(false);
+                this.api.asc_StartTextAroundSearch();
+            } else if (text !== '') { // search wasn't made
+                this.onInputSearchChange(text);
+            } else {
+                this.resultItems = [];
+                this.view.disableReplaceButtons(true);
+                this.view.clearResultsNumber();
+            }
+            this.view.disableNavButtons(this._state.currentResult, this._state.resultsNumber);
+        },
+
+        onShowPanel: function () {
+            if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
+                var me = this;
+                this.view.$resultsContainer.show();
+                this.resultItems.forEach(function (item) {
+                    me.view.$resultsContainer.append(item.el);
+                    if (item.selected) {
+                        $(item.el).addClass('selected');
+                    }
+                    $(item.el).on('click', function (el) {
+                        me.api.asc_SelectSearchElement(item.id);
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(el.currentTarget).addClass('selected');
+                    });
+                });
+                this.scrollToSelectedResult();
+            }
+        },
+
+        onHidePanel: function () {
+            this.hideResults();
+        },
+
+        notcriticalErrorTitle: 'Warning',
+        warnReplaceString: '{0} is not a valid special character for the Replace With box.'
 
     }, PE.Controllers.Search || {}));
 });
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index 912d430a4..cd1861b3b 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -72,7 +72,10 @@ define([
                 'click #left-btn-chat': _.bind(this.onCoauthOptions, this),
                 'click #left-btn-plugins': _.bind(this.onCoauthOptions, this),
                 /** coauthoring end **/
-                'click #left-btn-searchbar': _.bind(this.onCoauthOptions, this),
+                'click #left-btn-searchbar':  _.bind(function () {
+                    this.onCoauthOptions();
+                    this.fireEvent('search:aftershow', this.leftMenu);
+                }, this),
                 'click #left-btn-support': function() {
                     var config = this.mode.customization;
                     config && !!config.feedback && !!config.feedback.url ?
@@ -255,6 +258,7 @@ define([
             if (this.panelSearch) {
                 if (this.btnSearchBar.pressed) {
                     this.panelSearch.show();
+                    this.panelSearch.focus()
                 } else {
                     this.panelSearch.hide();
                 }
@@ -346,7 +350,7 @@ define([
             this.btnPlugins.setDisabled(disable);
         },
 
-        showMenu: function(menu, opts) {
+        showMenu: function(menu, opts, suspendAfter) {
             var re = /^(\w+):?(\w*)$/.exec(menu);
             if ( re[1] == 'file' ) {
                 this.menuFile.show(re[2].length ? re[2] : undefined, opts);
@@ -374,7 +378,7 @@ define([
                         this.btnSearchBar.toggle(true);
                         this.onBtnMenuClick(this.btnSearchBar);
                         this.onCoauthOptions();
-                        this.fireEvent('search:aftershow', this);
+                        !suspendAfter && this.fireEvent('search:aftershow', this);
                     }
                 }
                 /** coauthoring end **/

From 4444d1d687f8d3718d9eb5e854383fc47d8bccb8 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Sun, 3 Apr 2022 18:17:46 +0300
Subject: [PATCH 32/52] [SSE] Add methods for auto search

---
 apps/common/main/lib/view/SearchPanel.js      |  22 +-
 .../main/app/controller/LeftMenu.js           |  34 +-
 .../main/app/controller/Search.js             | 337 +++++++++++++++---
 3 files changed, 304 insertions(+), 89 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 71acac950..79002492b 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -182,8 +182,11 @@ define([
                         cls: 'input-group-nr',
                         data: [
                             { value: 0, displayValue: this.textSheet },
-                            { value: 1, displayValue: this.textWorkbook }
+                            { value: 1, displayValue: this.textWorkbook },
+                            { value: 2, displayValue: this.textSpecificRange}
                         ]
+                    }).on('selected', function(combo, record) {
+                        me.fireEvent('search:options', ['within', record.value]);
                     });
 
                     this.cmbSearch = new Common.UI.ComboBox({
@@ -196,6 +199,10 @@ define([
                             { value: 0, displayValue: this.textByRows },
                             { value: 1, displayValue: this.textByColumns }
                         ]
+                    }).on('selected', function(combo, record) {
+                        console.log(record.value);
+                        console.log(!record.value);
+                        me.fireEvent('search:options', ['search', !record.value]);
                     });
 
                     this.cmbLookIn = new Common.UI.ComboBox({
@@ -208,6 +215,10 @@ define([
                             { value: 0, displayValue: this.textFormulas },
                             { value: 1, displayValue: this.textValues }
                         ]
+                    }).on('selected', function(combo, record) {
+                        console.log(record.value);
+                        console.log(!record.value);
+                        me.fireEvent('search:options', ['lookIn', !record.value]);
                     });
 
                     this.$searchOptionsBlock = $('.search-options-block');
@@ -293,14 +304,6 @@ define([
             };
         },
 
-        getExtraSettings: function () {
-            return {
-                within: !this.cmbWithin.getValue(),
-                search: !this.cmbSearch.getValue(),
-                lookIn: !this.cmbLookIn.getValue()
-            };
-        },
-
         expandSearchOptions: function () {
             this.extendedOptions = !this.extendedOptions;
             this.$searchOptionsBlock[this.extendedOptions ? 'removeClass' : 'addClass']('no-expand');
@@ -341,6 +344,7 @@ define([
         textLookIn: 'Look in',
         textSheet: 'Sheet',
         textWorkbook: 'Workbook',
+        textSpecificRange: 'Specific range',
         textByRows: 'By rows',
         textByColumns: 'By columns',
         textFormulas: 'Formulas',
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index a9a17a479..f5c56da32 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -66,8 +66,7 @@ define([
                     'file:show': _.bind(this.fileShowHide, this, true),
                     'file:hide': _.bind(this.fileShowHide, this, false),
                     'comments:show': _.bind(this.commentsShowHide, this, true),
-                    'comments:hide': _.bind(this.commentsShowHide, this, false),
-                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
+                    'comments:hide': _.bind(this.commentsShowHide, this, false)
                 },
                 'Common.Views.About': {
                     'show':    _.bind(this.aboutShowHide, this, true),
@@ -856,15 +855,17 @@ define([
                         var selectedText = this.api.asc_GetSelectedText();
                         if (this.isSearchPanelVisible()) {
                             selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
-                            this.leftMenu.panelSearch.focus(s);
+                            this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
+                            this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
                             return false;
                         } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
+                            var viewport = this.getApplication().getController('Viewport');
                             if (s === 'replace') {
-                                this.getApplication().getController('Viewport').header.btnSearch.toggle(false);
-                                this.onShowHideSearch(true, this.getApplication().getController('Viewport').searchBar.inputSearch.val());
+                                viewport.header.btnSearch.toggle(false);
+                                this.onShowHideSearch(true, viewport.searchBar.inputSearch.val());
                             } else {
-                                selectedText && this.getApplication().getController('Viewport').searchBar.setText(selectedText);
-                                this.getApplication().getController('Viewport').searchBar.focus();
+                                selectedText && viewport.searchBar.setText(selectedText);
+                                viewport.searchBar.focus();
                                 return false;
                             }
                         } else if (s === 'search') {
@@ -874,7 +875,7 @@ define([
                             this.onShowHideSearch(true, selectedText);
                         }
                         this.leftMenu.btnSearchBar.toggle(true,true);
-                        this.leftMenu.panelSearch.focus(s);
+                        this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
                     }
                     return false;
                 case 'save':
@@ -1012,28 +1013,13 @@ define([
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 this.leftMenu.showMenu('advancedsearch');
-                this.onShowAfterSearch(findText);
+                this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
             }
         },
 
-        onShowAfterSearch: function (findText) {
-            var viewport = this.getApplication().getController('Viewport');
-            if (viewport.isSearchBarVisible()) {
-                viewport.searchBar.hide();
-            }
-
-            var text = findText || this.api.asc_GetSelectedText();
-            if (text) {
-                this.leftMenu.panelSearch.setFindText(text);
-            } else if (text !== undefined) {
-                this.leftMenu.panelSearch.setFindText('');
-            }
-            this.leftMenu.panelSearch.focus();
-        },
-
         onMenuSearchBar: function(obj, show) {
             if (show) {
                 var mode = this.mode.isEdit && !this.viewmode ? undefined : 'no-replace';
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 9fe63fbc2..5d4afe5e8 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -55,19 +55,37 @@ define([
         initialize: function () {
             this.addListeners({
                 'SearchBar': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
                 },
                 'Common.Views.SearchPanel': {
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
+                    'search:back': _.bind(this.onSearchNext, this, 'back'),
+                    'search:next': _.bind(this.onSearchNext, this, 'next'),
                     'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
+                    'search:replaceall': _.bind(this.onQueryReplaceAll, this),
+                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:options': _.bind(this.onChangeSearchOption, this),
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
+                    'show': _.bind(this.onShowPanel, this),
+                    'hide': _.bind(this.onHidePanel, this),
+                },
+                'LeftMenu': { // TO DO
+                    'search:aftershow': _.bind(this.onShowAfterSearch, this)
                 }
             });
         },
         onLaunch: function () {
-            this._state = {};
+            this._state = {
+                searchText: '',
+                matchCase: false,
+                matchWord: false,
+                useRegExp: false,
+                withinSheet: true,
+                searchByRows: true,
+                lookInFormulas: true
+            };
         },
 
         setMode: function (mode) {
@@ -78,6 +96,11 @@ define([
             if (api) {
                 this.api = api;
                 this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onRenameText, this));
+                this.api.asc_registerCallback('asc_onSetSearchCurrent', _.bind(this.onUpdateSearchCurrent, this));
+                this.api.asc_registerCallback('asc_onStartTextAroundSearch', _.bind(this.onStartTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this));
             }
             return this;
         },
@@ -87,64 +110,119 @@ define([
                 this.view : Backbone.Controller.prototype.getView.call(this, name);
         },
 
-        onQuerySearch: function (d, w, opts, fromPanel) {
-            var options = new Asc.asc_CFindOptions();
-            options.asc_setFindWhat(opts.textsearch);
-            options.asc_setScanForward(d != 'back');
-            options.asc_setIsMatchCase(opts.matchcase);
-            options.asc_setIsWholeCell(opts.matchword);
+        onChangeSearchOption: function (option, value) {
+            switch (option) {
+                case 'case-sensitive':
+                    this._state.matchCase = value;
+                    break;
+                case 'match-word':
+                    this._state.matchWord = value;
+                    break;
+                case 'regexp':
+                    this._state.useRegExp = value;
+                    break;
+                case 'within':
+                    this._state.withinSheet = value;
+                    break;
+                case 'search':
+                    this._state.searchByRows = value;
+                    break;
+                case 'lookIn':
+                    this._state.lookInFormulas = value;
+                    break;
 
-            var extraOptions = this.view.getExtraSettings();
-            options.asc_setScanOnOnlySheet(extraOptions.within);
-            options.asc_setScanByRows(extraOptions.search);
-            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
-
-            if (!this.api.asc_findText(options)) {
-                var me = this;
-                Common.UI.info({
-                    msg: this.textNoTextFound,
-                    callback: function() {
-                        if (fromPanel) {
-                            me.view.focus();
-                        } else {
-
-                        }
-                    }
-                });
             }
         },
 
-        onQueryReplace: function(w, opts) {
-            this.api.isReplaceAll = false;
-
-            var options = new Asc.asc_CFindOptions();
-            options.asc_setFindWhat(opts.textsearch);
-            options.asc_setReplaceWith(opts.textreplace);
-            options.asc_setIsMatchCase(opts.matchcase);
-            options.asc_setIsWholeCell(opts.matchword);
-
-            var extraOptions = this.view.getExtraSettings();
-            options.asc_setScanOnOnlySheet(extraOptions.within);
-            options.asc_setScanByRows(extraOptions.search);
-            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
-            options.asc_setIsReplaceAll(false);
-
-            this.api.asc_replaceText(options);
+        onSearchNext: function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+                this._state.searchText = text;
+                if (this.onQuerySearch(type) && this.searchTimer) {
+                    this.hideResults();
+                    clearInterval(this.searchTimer);
+                    this.searchTimer = undefined;
+                    if (this.view.$el.is(':visible')) {
+                        this.api.asc_StartTextAroundSearch();
+                    }
+                }
+            }
         },
 
-        onQueryReplaceAll: function(w, opts) {
-            this.api.isReplaceAll = true;
+        onInputSearchChange: function (text) {
+            var me = this;
+            if (this._state.searchText !== text) {
+                this._state.newSearchText = text;
+                this._lastInputChange = (new Date());
+                if (this.searchTimer === undefined) {
+                    this.searchTimer = setInterval(function(){
+                        if ((new Date()) - me._lastInputChange < 400) return;
 
+                        me.hideResults();
+                        me._state.searchText = me._state.newSearchText;
+                        if (me._state.newSearchText !== '' && me.onQuerySearch()) {
+                            if (me.view.$el.is(':visible')) {
+                                me.api.asc_StartTextAroundSearch();
+                            }
+                            me.view.disableReplaceButtons(false);
+                        } else if (me._state.newSearchText === '') {
+                            me.view.updateResultsNumber('no-results');
+                            me.view.disableReplaceButtons(true);
+                        }
+                        clearInterval(me.searchTimer);
+                        me.searchTimer = undefined;
+                    }, 10);
+                }
+            }
+        },
+
+        onQuerySearch: function (d, w, opts, fromPanel) {
             var options = new Asc.asc_CFindOptions();
-            options.asc_setFindWhat(opts.textsearch);
-            options.asc_setReplaceWith(opts.textreplace);
-            options.asc_setIsMatchCase(opts.matchcase);
-            options.asc_setIsWholeCell(opts.matchword);
+            options.asc_setFindWhat(this._state.searchText);
+            options.asc_setScanForward(d != 'back');
+            options.asc_setIsMatchCase(this._state.matchCase);
+            options.asc_setIsWholeCell(this._state.matchWord);
+            options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+            options.asc_setScanByRows(this._state.searchByRows);
+            options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+            if (!this.api.asc_findText(options)) {
+                this.resultItems = [];
+                this.view.updateResultsNumber(undefined, 0);
+                this.view.disableReplaceButtons(true);
+                this._state.currentResult = 0;
+                this._state.resultsNumber = 0;
+                this.view.disableNavButtons();
+                return false;
+            }
+            return true;
+        },
 
-            var extraOptions = this.view.getExtraSettings();
-            options.asc_setScanOnOnlySheet(extraOptions.within);
-            options.asc_setScanByRows(extraOptions.search);
-            options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+        onQueryReplace: function(textSearch, textReplace) {
+            if (textSearch !== '') {
+                this.api.isReplaceAll = false;
+                var options = new Asc.asc_CFindOptions();
+                options.asc_setFindWhat(textSearch);
+                options.asc_setReplaceWith(textReplace);
+                options.asc_setIsMatchCase(this._state.matchCase);
+                options.asc_setIsWholeCell(this._state.matchWord);
+                options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+                options.asc_setScanByRows(this._state.searchByRows);
+                options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+                options.asc_setIsReplaceAll(false);
+
+                this.api.asc_replaceText(options);
+            }
+        },
+
+        onQueryReplaceAll: function(textSearch, textReplace) {
+            this.api.isReplaceAll = true;
+            var options = new Asc.asc_CFindOptions();
+            options.asc_setFindWhat(textSearch);
+            options.asc_setReplaceWith(textReplace);
+            options.asc_setIsMatchCase(this._state.matchCase);
+            options.asc_setIsWholeCell(this._state.matchWord);
+            options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+            options.asc_setScanByRows(this._state.searchByRows);
+            options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
             options.asc_setIsReplaceAll(true);
 
             this.api.asc_replaceText(options);
@@ -152,7 +230,7 @@ define([
 
         onRenameText: function (found, replaced) {
             var me = this;
-            if (this.api.isReplaceAll) {
+            /*if (this.api.isReplaceAll) {
                 Common.UI.info({
                     msg: (found) ? ((!found-replaced) ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced)) : this.textNoTextFound,
                     callback: function() {
@@ -181,7 +259,154 @@ define([
                         }
                     });
                 }
+            }*/
+        },
+
+        onApiRemoveTextAroundSearch: function (arr) {
+            var me = this;
+            arr.forEach(function (id) {
+                var ind = _.findIndex(me.resultItems, {id: id});
+                if (ind !== -1) {
+                    me.resultItems[ind].$el.remove();
+                    me.resultItems.splice(ind, 1);
+                }
+            });
+        },
+
+        onUpdateSearchCurrent: function (current, all) {
+            if (current === -1) return;
+            this._state.currentResult = current;
+            this._state.resultsNumber = all;
+            if (this.view) {
+                this.view.updateResultsNumber(current, all);
+                this.view.disableNavButtons(current, all);
+                if (this.resultItems.length > 0) {
+                    this.resultItems.forEach(function (item) {
+                        item.selected = false;
+                    });
+                    if (this.resultItems[current]) {
+                        this.resultItems[current].selected = true;
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(this.resultItems[current].el).addClass('selected');
+                        this.scrollToSelectedResult(current);
+                    }
+                }
             }
+            Common.NotificationCenter.trigger('search:updateresults', current, all);
+        },
+
+        scrollToSelectedResult: function (ind) {
+            var index = ind !== undefined ? ind : _.findIndex(this.resultItems, {selected: true});
+            if (index !== -1) {
+                var item = this.resultItems[index].$el,
+                    itemHeight = item.outerHeight(),
+                    itemTop = item.position().top,
+                    container = this.view.$resultsContainer,
+                    containerHeight = container.outerHeight(),
+                    containerTop = container.scrollTop();
+                if (itemTop < 0 || (containerTop === 0 && itemTop > containerHeight)) {
+                    container.scroller.scrollTop(containerTop + itemTop - 12);
+                } else if (itemTop + itemHeight > containerHeight) {
+                    container.scroller.scrollTop(containerTop + itemHeight);
+                }
+            }
+        },
+
+        onStartTextAroundSearch: function () {
+            if (this.view) {
+                this._state.isStartedAddingResults = true;
+            }
+        },
+
+        onEndTextAroundSearch: function () {
+            if (this.view) {
+                this._state.isStartedAddingResults = false;
+                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            }
+        },
+
+        onApiGetTextAroundSearch: function (data) { // [id, sheet, name, cell, value, formula]
+            if (this.view && this._state.isStartedAddingResults) {
+                if (data.length > 300) return;
+                var me = this;
+                me.resultItems = [];
+                data.forEach(function (item, ind) {
+                    var el = document.createElement("div"),
+                        isSelected = ind === me._state.currentResult;
+                    el.className = 'item';
+                    el.innerHTML = item[4].trim();
+                    me.view.$resultsContainer.append(el);
+                    if (isSelected) {
+                        $(el).addClass('selected');
+                    }
+
+                    var resultItem = {id: item[0], $el: $(el), el: el, selected: isSelected};
+                    me.resultItems.push(resultItem);
+                    $(el).on('click', _.bind(function (el) {
+                        var id = item[0];
+                        me.api.asc_SelectSearchElement(id);
+                    }, me));
+                });
+
+                this.view.$resultsContainer.show();
+            }
+        },
+
+        hideResults: function () {
+            if (this.view) {
+                this.view.$resultsContainer.hide();
+                this.view.$resultsContainer.empty();
+            }
+        },
+
+        onShowAfterSearch: function (findText) {
+            var viewport = this.getApplication().getController('Viewport');
+            if (viewport.isSearchBarVisible()) {
+                viewport.searchBar.hide();
+            }
+
+            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            if (text) {
+                this.view.setFindText(text);
+            } else if (text !== undefined) {
+                this.view.setFindText('');
+            }
+
+            this.hideResults();
+            if (text !== '' && text === this._state.searchText) { // search was made
+                this.view.disableReplaceButtons(false);
+                this.api.asc_StartTextAroundSearch();
+            } else if (text !== '') { // search wasn't made
+                this.onInputSearchChange(text);
+            } else {
+                this.resultItems = [];
+                this.view.disableReplaceButtons(true);
+                this.view.clearResultsNumber();
+            }
+            this.view.disableNavButtons(this._state.currentResult, this._state.resultsNumber);
+        },
+
+        onShowPanel: function () {
+            if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
+                var me = this;
+                this.view.$resultsContainer.show();
+                this.resultItems.forEach(function (item) {
+                    me.view.$resultsContainer.append(item.el);
+                    if (item.selected) {
+                        $(item.el).addClass('selected');
+                    }
+                    $(item.el).on('click', function (el) {
+                        me.api.asc_SelectSearchElement(item.id);
+                        $('#search-results').find('.item').removeClass('selected');
+                        $(el.currentTarget).addClass('selected');
+                    });
+                });
+                this.scrollToSelectedResult();
+            }
+        },
+
+        onHidePanel: function () {
+            this.hideResults();
         },
 
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',

From 7dce541fca64f619ff2cca3511fc99d221b4ba1f Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 4 Apr 2022 22:09:09 +0300
Subject: [PATCH 33/52] [SSE] New search: add select data range setting

---
 .../main/lib/template/SearchPanel.template    |  1 +
 apps/common/main/lib/view/SearchPanel.js      | 12 ++++++
 .../main/app/controller/Search.js             | 42 +++++++++++++++----
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index d40ebdb29..91fdda334 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -38,6 +38,7 @@
                         <div id="search-options">
                             <label class="input-label"><%= scope.textWithin %></label>
                             <div id="search-adv-cmb-within"></div>
+                            <div id="search-adv-select-range"></div>
                             <label class="input-label"><%= scope.textSearch %></label>
                             <div id="search-adv-cmb-search"></div>
                             <label class="input-label"><%= scope.textLookIn %></label>
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 79002492b..61c6ed581 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -189,6 +189,17 @@ define([
                         me.fireEvent('search:options', ['within', record.value]);
                     });
 
+                    this.inputSelectRange = new Common.UI.InputField({
+                        el: $('#search-adv-select-range'),
+                        placeHolder: this.textSelectDataRange,
+                        allowBlank: true,
+                        validateOnChange: true,
+                        style: "width: 219px; margin-top: 8px",
+                        disabled: true
+                    }).on('changed:after', function(input, newValue) {
+                        me.fireEvent('search:options', ['range', newValue]);
+                    });
+
                     this.cmbSearch = new Common.UI.ComboBox({
                         el: $('#search-adv-cmb-search'),
                         menuStyle: 'min-width: 100%;',
@@ -340,6 +351,7 @@ define([
         textMatchUsingRegExp: 'Match using regular expressions',
         textWholeWords: 'Whole words only',
         textWithin: 'Within',
+        textSelectDataRange: 'Select Data range',
         textSearch: 'Search',
         textLookIn: 'Look in',
         textSheet: 'Sheet',
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 5d4afe5e8..2ef5bb120 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -69,7 +69,7 @@ define([
                     'search:options': _.bind(this.onChangeSearchOption, this),
                     'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
                     'show': _.bind(this.onShowPanel, this),
-                    'hide': _.bind(this.onHidePanel, this),
+                    'hide': _.bind(this.onHidePanel, this)
                 },
                 'LeftMenu': { // TO DO
                     'search:aftershow': _.bind(this.onShowAfterSearch, this)
@@ -82,14 +82,16 @@ define([
                 matchCase: false,
                 matchWord: false,
                 useRegExp: false,
-                withinSheet: true,
+                withinSheet: Asc.c_oAscSearchBy.Sheet,
                 searchByRows: true,
-                lookInFormulas: true
+                lookInFormulas: true,
+                isValidSelectedRange: true
             };
         },
 
         setMode: function (mode) {
             this.view = this.createView('Common.Views.SearchPanel', { mode: mode });
+            this.view.on('render:after', _.bind(this.onAfterRender, this));
         },
 
         setApi: function (api) {
@@ -110,6 +112,18 @@ define([
                 this.view : Backbone.Controller.prototype.getView.call(this, name);
         },
 
+        onAfterRender: function () {
+            var me = this;
+            this.view.inputSelectRange.validation = function(value) {
+                if (_.isEmpty(value)) {
+                    return true;
+                }
+                var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSearchBy.Range, value);
+                me._state.isValidSelectedRange = isvalid;
+                return (isvalid === Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;
+            };
+        },
+
         onChangeSearchOption: function (option, value) {
             switch (option) {
                 case 'case-sensitive':
@@ -122,7 +136,11 @@ define([
                     this._state.useRegExp = value;
                     break;
                 case 'within':
-                    this._state.withinSheet = value;
+                    this._state.withinSheet = value === 0 ? Asc.c_oAscSearchBy.Sheet : (value === 1 ? Asc.c_oAscSearchBy.Workbook : Asc.c_oAscSearchBy.Range);
+                    this.view.inputSelectRange.setDisabled(value !== Asc.c_oAscSearchBy.Range);
+                    break;
+                case 'range':
+                    this._state.selectedRange = value;
                     break;
                 case 'search':
                     this._state.searchByRows = value;
@@ -181,7 +199,10 @@ define([
             options.asc_setScanForward(d != 'back');
             options.asc_setIsMatchCase(this._state.matchCase);
             options.asc_setIsWholeCell(this._state.matchWord);
-            options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+            options.asc_setScanOnOnlySheet(this._state.withinSheet);
+            if (this._state.withinSheet === Asc.c_oAscSearchBy.Range) {
+                options.asc_setSpecificRange(this._state.selectedRange);
+            }
             options.asc_setScanByRows(this._state.searchByRows);
             options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
             if (!this.api.asc_findText(options)) {
@@ -204,7 +225,10 @@ define([
                 options.asc_setReplaceWith(textReplace);
                 options.asc_setIsMatchCase(this._state.matchCase);
                 options.asc_setIsWholeCell(this._state.matchWord);
-                options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+                options.asc_setScanOnOnlySheet(this._state.withinSheet);
+                if (this._state.withinSheet === Asc.c_oAscSearchBy.Range) {
+                    options.asc_setSpecificRange(this._state.selectedRange);
+                }
                 options.asc_setScanByRows(this._state.searchByRows);
                 options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
                 options.asc_setIsReplaceAll(false);
@@ -220,7 +244,10 @@ define([
             options.asc_setReplaceWith(textReplace);
             options.asc_setIsMatchCase(this._state.matchCase);
             options.asc_setIsWholeCell(this._state.matchWord);
-            options.asc_setScanOnOnlySheet(this._state.withinSheet); // TO DO
+            options.asc_setScanOnOnlySheet(this._state.withinSheet);
+            if (this._state.withinSheet === Asc.c_oAscSearchBy.Range) {
+                options.asc_setSpecificRange(this._state.selectedRange);
+            }
             options.asc_setScanByRows(this._state.searchByRows);
             options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
             options.asc_setIsReplaceAll(true);
@@ -412,6 +439,7 @@ define([
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
         textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',
+        textInvalidRange: 'ERROR! Invalid cells range',
 
     }, SSE.Controllers.Search || {}));
 });
\ No newline at end of file

From 13a79663e6fcba2c659817fcea2873d29ec0cedf Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 6 Apr 2022 22:32:50 +0300
Subject: [PATCH 34/52] [SSE] Make select range setting in search panel

---
 apps/common/main/lib/view/SearchPanel.js      |  9 +--
 .../main/app/controller/Search.js             | 58 +++++++++++++++++--
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 61c6ed581..48d96bfb9 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -189,15 +189,16 @@ define([
                         me.fireEvent('search:options', ['within', record.value]);
                     });
 
-                    this.inputSelectRange = new Common.UI.InputField({
+                    this.inputSelectRange = new Common.UI.InputFieldBtn({
                         el: $('#search-adv-select-range'),
                         placeHolder: this.textSelectDataRange,
                         allowBlank: true,
                         validateOnChange: true,
+                        validateOnBlur: true,
                         style: "width: 219px; margin-top: 8px",
                         disabled: true
-                    }).on('changed:after', function(input, newValue) {
-                        me.fireEvent('search:options', ['range', newValue]);
+                    }).on('keyup:after', function(input, e) {
+                        me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]);
                     });
 
                     this.cmbSearch = new Common.UI.ComboBox({
@@ -266,7 +267,7 @@ define([
 
         focus: function(type) {
             var me  = this,
-                el = type === 'replace' ? me.inputReplace.$el : me.inputText.$el;
+                el = type === 'replace' ? me.inputReplace.$el : (type === 'range' ? me.inputSelectRange.$el : me.inputText.$el);
             setTimeout(function(){
                 el.find('input').focus();
                 el.find('input').select();
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 2ef5bb120..2c63a7479 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -118,13 +118,15 @@ define([
                 if (_.isEmpty(value)) {
                     return true;
                 }
-                var isvalid = me.api.asc_checkDataRange(Asc.c_oAscSearchBy.Range, value);
-                me._state.isValidSelectedRange = isvalid;
+                var isvalid = me.api.asc_checkDataRange(undefined, value);
+                me._state.isValidSelectedRange = isvalid !== Asc.c_oAscError.ID.DataRangeError;
                 return (isvalid === Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;
             };
+            this.view.inputSelectRange.on('button:click', _.bind(this.onRangeSelect, this));
         },
 
-        onChangeSearchOption: function (option, value) {
+        onChangeSearchOption: function (option, value, noSearch) {
+            var runSearch = true;
             switch (option) {
                 case 'case-sensitive':
                     this._state.matchCase = value;
@@ -138,9 +140,13 @@ define([
                 case 'within':
                     this._state.withinSheet = value === 0 ? Asc.c_oAscSearchBy.Sheet : (value === 1 ? Asc.c_oAscSearchBy.Workbook : Asc.c_oAscSearchBy.Range);
                     this.view.inputSelectRange.setDisabled(value !== Asc.c_oAscSearchBy.Range);
+                    if (value === Asc.c_oAscSearchBy.Range) {
+                        runSearch = false;
+                    }
                     break;
                 case 'range':
                     this._state.selectedRange = value;
+                    runSearch = !noSearch;
                     break;
                 case 'search':
                     this._state.searchByRows = value;
@@ -148,8 +154,39 @@ define([
                 case 'lookIn':
                     this._state.lookInFormulas = value;
                     break;
-
             }
+            if (runSearch && this._state.searchText !== '' && this.onQuerySearch()) {
+                this.hideResults();
+                clearInterval(this.searchTimer);
+                this.searchTimer = undefined;
+                this.api.asc_StartTextAroundSearch();
+            }
+        },
+
+        onRangeSelect: function () {
+            var me = this;
+            var handlerDlg = function(dlg, result) {
+                if (result == 'ok') {
+                    var valid = dlg.getSettings();
+                    me.view.inputSelectRange.setValue(valid);
+                    me.view.inputSelectRange.checkValidate();
+                    me.onChangeSearchOption('range', valid);
+                }
+            };
+
+            var win = new SSE.Views.CellRangeDialog({
+                handler: handlerDlg
+            }).on('close', function() {
+                _.delay(function(){
+                    me.view.inputSelectRange.focus();
+                },1);
+            });
+            win.show();
+            win.setSettings({
+                api: me.api,
+                range: (!_.isEmpty(me.view.inputSelectRange.getValue()) && (me.view.inputSelectRange.checkValidate()==true)) ? me.view.inputSelectRange.getValue() : me._state.selectedRange,
+                type: Asc.c_oAscSelectionDialogType.PrintTitles
+            });
         },
 
         onSearchNext: function (type, text, e) {
@@ -194,6 +231,19 @@ define([
         },
 
         onQuerySearch: function (d, w, opts, fromPanel) {
+            var me = this;
+            if (this._state.withinSheet === Asc.c_oAscSearchBy.Range && !this._state.isValidSelectedRange) {
+                Common.UI.warning({
+                    title: this.notcriticalErrorTitle,
+                    msg: this.textInvalidRange,
+                    buttons: ['ok'],
+                    callback: function () {
+                        me.view.focus('range');
+                    }
+                });
+                return;
+            }
+
             var options = new Asc.asc_CFindOptions();
             options.asc_setFindWhat(this._state.searchText);
             options.asc_setScanForward(d != 'back');

From 98a995a6cca68e918f40264dd1f2b67de11a7c13 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 8 Apr 2022 13:36:38 +0300
Subject: [PATCH 35/52] [SSE] Make result table in search panel

---
 .../main/app/controller/Search.js             | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 2c63a7479..b68ae8480 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -405,26 +405,47 @@ define([
         onApiGetTextAroundSearch: function (data) { // [id, sheet, name, cell, value, formula]
             if (this.view && this._state.isStartedAddingResults) {
                 if (data.length > 300) return;
-                var me = this;
+                var me = this,
+                    container = me.view.$resultsContainer;
+                container.html('<table style="width:100%">' +
+                    '<col style="width:20%">' +
+                    '<col style="width:20%">' +
+                    '<col style="width:20%">' +
+                    '<col style="width:20%">' +
+                    '<col style="width:20%">' +
+                    '<thead>' +
+                        '<tr>' +
+                            '<th>' + this.textSheet +   '</th>' +
+                            '<th>' + this.textName +    '</th>' +
+                            '<th>' + this.textCell +    '</th>' +
+                            '<th>' + this.textValue +   '</th>' +
+                            '<th>' + this.textFormula + '</th>' +
+                        '</tr>' +
+                    '</thead>' +
+                    '<tbody>' +
+                    '</table>');
+                var $tableBody = container.find('tbody');
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
-                    var el = document.createElement("div"),
-                        isSelected = ind === me._state.currentResult;
-                    el.className = 'item';
-                    el.innerHTML = item[4].trim();
-                    me.view.$resultsContainer.append(el);
+                    var isSelected = ind === me._state.currentResult;
+                    var tr = '<tr class="item">' +
+                        '<td>' + item[1] + '</td>' +
+                        '<td>' + item[2] + '</td>' +
+                        '<td>' + item[3] + '</td>' +
+                        '<td>' + item[4] + '</td>' +
+                        '<td>' + item[5] + '</td>' +
+                        '</tr>';
+                    var $item = $(tr).appendTo($tableBody);
                     if (isSelected) {
-                        $(el).addClass('selected');
+                        $item.addClass('selected');
                     }
-
-                    var resultItem = {id: item[0], $el: $(el), el: el, selected: isSelected};
+                    var resultItem = {id: item[0], $el: $item, selected: isSelected};
                     me.resultItems.push(resultItem);
-                    $(el).on('click', _.bind(function (el) {
+                    $item.on('click', _.bind(function (el) {
                         var id = item[0];
                         me.api.asc_SelectSearchElement(id);
                     }, me));
                 });
-
                 this.view.$resultsContainer.show();
             }
         },
@@ -490,6 +511,11 @@ define([
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
         textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',
         textInvalidRange: 'ERROR! Invalid cells range',
+        textSheet: 'Sheet',
+        textName: 'Name',
+        textCell: 'Cell',
+        textValue: 'Value',
+        textFormula: 'Formula'
 
     }, SSE.Controllers.Search || {}));
 });
\ No newline at end of file

From f69eb8ddfac00abb27a62815455f5f68fc3e42a9 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Sun, 10 Apr 2022 23:30:24 +0300
Subject: [PATCH 36/52] [SSE] Make results table in search panel

---
 apps/common/main/lib/view/SearchPanel.js      | 47 ++++++++----
 .../main/app/controller/Search.js             |  5 ++
 .../main/app/controller/Search.js             | 73 +++++++------------
 .../main/resources/less/leftmenu.less         | 46 ++++++++++++
 4 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 48d96bfb9..64f43ff40 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -160,18 +160,6 @@ define([
                 this.$resultsContainer = $('#search-results');
                 this.$resultsContainer.hide();
 
-                this.$resultsContainer.scroller = new Common.UI.Scroller({
-                    el: this.$resultsContainer,
-                    includePadding: true,
-                    useKeyboard: true,
-                    minScrollbarLength: 40,
-                    alwaysVisibleY: true
-                });
-                Common.NotificationCenter.on('window:resize', function() {
-                    me.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
-                    me.$resultsContainer.scroller.update({alwaysVisibleY: true});
-                });
-
                 Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
                 if (window.SSE) {
                     this.cmbWithin = new Common.UI.ComboBox({
@@ -244,7 +232,36 @@ define([
                     this.cmbWithin.setValue(0);
                     this.cmbSearch.setValue(0);
                     this.cmbLookIn.setValue(0);
+
+                    var tableTemplate = '<div class="search-table">' +
+                        '<div class="header-item">' + this.textSheet + '</div>' +
+                        '<div class="header-item">' + this.textName + '</div>' +
+                        '<div class="header-item">' + this.textCell + '</div>' +
+                        '<div class="header-item">' + this.textValue + '</div>' +
+                        '<div class="header-item">' + this.textFormula + '</div>' +
+                        '<div class="ps-container oo search-items"></div>' +
+                        '</div>',
+                        $resultTable = $(tableTemplate).appendTo(this.$resultsContainer);
+                    this.$resultsContainer.scroller = new Common.UI.Scroller({
+                        el: $resultTable.find('.search-items'),
+                        includePadding: true,
+                        useKeyboard: true,
+                        minScrollbarLength: 40,
+                        alwaysVisibleY: true
+                    });
+                } else {
+                    this.$resultsContainer.scroller = new Common.UI.Scroller({
+                        el: this.$resultsContainer,
+                        includePadding: true,
+                        useKeyboard: true,
+                        minScrollbarLength: 40,
+                        alwaysVisibleY: true
+                    });
                 }
+                Common.NotificationCenter.on('window:resize', function() {
+                    me.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+                    me.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                });
             }
 
             this.rendered = true;
@@ -366,7 +383,11 @@ define([
         textNoMatches: 'No matches',
         textNoSearchResults: 'No search results',
         textItemEntireCell: 'Entire cell contents',
-        textTooManyResults: 'There are too many results to show here'
+        textTooManyResults: 'There are too many results to show here',
+        textName: 'Name',
+        textCell: 'Cell',
+        textValue: 'Value',
+        textFormula: 'Formula'
 
     }, Common.Views.SearchPanel || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 9568d05f6..0bf486d19 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -343,6 +343,11 @@ define([
             }
 
             var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            if (this.resultItems && this.resultItems.length > 0 &&
+                (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
+                    this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
+                return;
+            }
             if (text) {
                 this.view.setFindText(text);
             } else if (text !== undefined) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index b68ae8480..39d400551 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -364,7 +364,7 @@ define([
                     if (this.resultItems[current]) {
                         this.resultItems[current].selected = true;
                         $('#search-results').find('.item').removeClass('selected');
-                        $(this.resultItems[current].el).addClass('selected');
+                        this.resultItems[current].$el.addClass('selected');
                         this.scrollToSelectedResult(current);
                     }
                 }
@@ -378,13 +378,13 @@ define([
                 var item = this.resultItems[index].$el,
                     itemHeight = item.outerHeight(),
                     itemTop = item.position().top,
-                    container = this.view.$resultsContainer,
+                    container = this.view.$resultsContainer.find('.search-items'),
                     containerHeight = container.outerHeight(),
                     containerTop = container.scrollTop();
                 if (itemTop < 0 || (containerTop === 0 && itemTop > containerHeight)) {
-                    container.scroller.scrollTop(containerTop + itemTop - 12);
+                    this.view.$resultsContainer.scroller.scrollTop(containerTop + itemTop - 12);
                 } else if (itemTop + itemHeight > containerHeight) {
-                    container.scroller.scrollTop(containerTop + itemHeight);
+                    this.view.$resultsContainer.scroller.scrollTop(containerTop + itemHeight);
                 }
             }
         },
@@ -406,40 +406,22 @@ define([
             if (this.view && this._state.isStartedAddingResults) {
                 if (data.length > 300) return;
                 var me = this,
-                    container = me.view.$resultsContainer;
-                container.html('<table style="width:100%">' +
-                    '<col style="width:20%">' +
-                    '<col style="width:20%">' +
-                    '<col style="width:20%">' +
-                    '<col style="width:20%">' +
-                    '<col style="width:20%">' +
-                    '<thead>' +
-                        '<tr>' +
-                            '<th>' + this.textSheet +   '</th>' +
-                            '<th>' + this.textName +    '</th>' +
-                            '<th>' + this.textCell +    '</th>' +
-                            '<th>' + this.textValue +   '</th>' +
-                            '<th>' + this.textFormula + '</th>' +
-                        '</tr>' +
-                    '</thead>' +
-                    '<tbody>' +
-                    '</table>');
-                var $tableBody = container.find('tbody');
+                    $innerResults = me.view.$resultsContainer.find('.search-items');
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
                     var isSelected = ind === me._state.currentResult;
-                    var tr = '<tr class="item">' +
-                        '<td>' + item[1] + '</td>' +
-                        '<td>' + item[2] + '</td>' +
-                        '<td>' + item[3] + '</td>' +
-                        '<td>' + item[4] + '</td>' +
-                        '<td>' + item[5] + '</td>' +
-                        '</tr>';
-                    var $item = $(tr).appendTo($tableBody);
+                    var tr = '<div class="item" style="width: 100%;">' +
+                        '<div>' + item[1] + '</div>' +
+                        '<div>' + item[2] + '</div>' +
+                        '<div>' + item[3] + '</div>' +
+                        '<div>' + item[4] + '</div>' +
+                        '<div>' + item[5] + '</div>' +
+                        '</div>';
+                    var $item = $(tr).appendTo($innerResults);
                     if (isSelected) {
                         $item.addClass('selected');
                     }
-                    var resultItem = {id: item[0], $el: $item, selected: isSelected};
+                    var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected};
                     me.resultItems.push(resultItem);
                     $item.on('click', _.bind(function (el) {
                         var id = item[0];
@@ -453,7 +435,7 @@ define([
         hideResults: function () {
             if (this.view) {
                 this.view.$resultsContainer.hide();
-                this.view.$resultsContainer.empty();
+                this.view.$resultsContainer.find('tbody').empty();
             }
         },
 
@@ -464,14 +446,19 @@ define([
             }
 
             var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
-            if (text) {
+            if (this.resultItems && this.resultItems.length > 0 &&
+                (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
+                    this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
+                return;
+            }
+            if (text && text !== this.view.inputText.getValue()) {
                 this.view.setFindText(text);
             } else if (text !== undefined) {
                 this.view.setFindText('');
             }
 
             this.hideResults();
-            if (text !== '' && text === this._state.searchText) { // search was made
+            if (text !== '') { // search was made
                 this.view.disableReplaceButtons(false);
                 this.api.asc_StartTextAroundSearch();
             } else if (text !== '') { // search wasn't made
@@ -486,14 +473,15 @@ define([
 
         onShowPanel: function () {
             if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
-                var me = this;
+                var me = this,
+                    $tableBody = this.view.$resultsContainer.find('tbody');
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
-                    me.view.$resultsContainer.append(item.el);
+                    var $item = $(item.el).appendTo($tableBody);
                     if (item.selected) {
-                        $(item.el).addClass('selected');
+                        $item.addClass('selected');
                     }
-                    $(item.el).on('click', function (el) {
+                    $item.on('click', function (el) {
                         me.api.asc_SelectSearchElement(item.id);
                         $('#search-results').find('.item').removeClass('selected');
                         $(el.currentTarget).addClass('selected');
@@ -510,12 +498,7 @@ define([
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
         textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',
-        textInvalidRange: 'ERROR! Invalid cells range',
-        textSheet: 'Sheet',
-        textName: 'Name',
-        textCell: 'Cell',
-        textValue: 'Value',
-        textFormula: 'Formula'
+        textInvalidRange: 'ERROR! Invalid cells range'
 
     }, SSE.Controllers.Search || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index 40a74439b..a4dd9ad5f 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -660,3 +660,49 @@
     height: 16px;
     width: 16px;
 }
+
+.search-panel {
+    #search-results {
+        padding-top: 6px;
+        .search-table {
+            width:100%;
+            height: 100%;
+            position: relative;
+        }
+        .header-item {
+            width:16%;
+            display: inline-block;
+            height: 18px;
+            text-align: start;
+            font-weight: normal;
+            padding-left: 4px;
+            &:not(:first-child) {
+                border-left: @scaled-one-px-value-ie solid @border-divider-ie;
+                border-left: @scaled-one-px-value solid @border-divider;
+            }
+            &:last-child {
+                width:36%;
+            }
+        }
+        .search-items {
+            height: calc(100% - 24px);
+            position: absolute;
+            top: 24px;
+            width: 100%;
+            overflow: hidden;
+            .item {
+                padding: 0;
+                display: flex;
+                div {
+                    width: 16%;
+                    padding-left: 4px;
+                    height: 28px;
+                    line-height: 28px;
+                    &:last-child {
+                        width: 36%;
+                    }
+                }
+            }
+        }
+    }
+}

From cf2068b7cd459c92e3725e533fe8c902cad58869 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 11 Apr 2022 20:16:33 +0300
Subject: [PATCH 37/52] [SSE] New search: add select results on sheet, fix
 replace, fix changing of results container height

---
 apps/common/main/lib/view/SearchPanel.js      |  3 +
 .../main/app/controller/Search.js             | 74 ++++++++++++-------
 .../main/resources/less/leftmenu.less         |  7 +-
 3 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 64f43ff40..6e718be65 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -337,6 +337,9 @@ define([
             this.extendedOptions = !this.extendedOptions;
             this.$searchOptionsBlock[this.extendedOptions ? 'removeClass' : 'addClass']('no-expand');
             Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions);
+
+            this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
         },
 
         setFindText: function (val) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 39d400551..c444fab34 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -58,7 +58,9 @@ define([
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
                     'search:next': _.bind(this.onSearchNext, this, 'next'),
                     'search:input': _.bind(this.onInputSearchChange, this),
-                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
+                    'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
+                    'show': _.bind(this.onSelectSearchingResults, this, true),
+                    'hide': _.bind(this.onSelectSearchingResults, this, false)
                 },
                 'Common.Views.SearchPanel': {
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
@@ -307,36 +309,43 @@ define([
 
         onRenameText: function (found, replaced) {
             var me = this;
-            /*if (this.api.isReplaceAll) {
-                Common.UI.info({
-                    msg: (found) ? ((!found-replaced) ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced)) : this.textNoTextFound,
-                    callback: function() {
-                        me.view.focus();
-                    }
-                });
-            } else {
-                var sett = this.view.getSettings();
-                var options = new Asc.asc_CFindOptions();
-                options.asc_setFindWhat(sett.textsearch);
-                options.asc_setScanForward(true);
-                options.asc_setIsMatchCase(sett.matchcase);
-                options.asc_setIsWholeCell(sett.matchword);
-
-                var extraOptions = this.view.getExtraSettings();
-                options.asc_setScanOnOnlySheet(extraOptions.within);
-                options.asc_setScanByRows(extraOptions.search);
-                options.asc_setLookIn(extraOptions.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
-
-
-                if (!me.api.asc_findText(options)) {
+            if (this.api.isReplaceAll) {
+                if (!found) {
+                    this.resultItems = [];
+                    this.view.updateResultsNumber(undefined, 0);
+                    this.view.disableReplaceButtons(true);
+                    this._state.currentResult = 0;
+                    this._state.resultsNumber = 0;
+                    this.view.disableNavButtons();
+                } else {
                     Common.UI.info({
-                        msg: this.textNoTextFound,
+                        msg: !found-replaced ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced),
                         callback: function() {
                             me.view.focus();
                         }
                     });
                 }
-            }*/
+            } else {
+                var options = new Asc.asc_CFindOptions();
+                options.asc_setFindWhat(this._state.searchText);
+                options.asc_setScanForward(true);
+                options.asc_setIsMatchCase(this._state.matchCase);
+                options.asc_setIsWholeCell(this._state.matchWord);
+                options.asc_setScanOnOnlySheet(this._state.withinSheet);
+                if (this._state.withinSheet === Asc.c_oAscSearchBy.Range) {
+                    options.asc_setSpecificRange(this._state.selectedRange);
+                }
+                options.asc_setScanByRows(this._state.searchByRows);
+                options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
+                if (!this.api.asc_findText(options)) {
+                    this.resultItems = [];
+                    this.view.updateResultsNumber(undefined, 0);
+                    this.view.disableReplaceButtons(true);
+                    this._state.currentResult = 0;
+                    this._state.resultsNumber = 0;
+                    this.view.disableNavButtons();
+                }
+            }
         },
 
         onApiRemoveTextAroundSearch: function (arr) {
@@ -435,7 +444,7 @@ define([
         hideResults: function () {
             if (this.view) {
                 this.view.$resultsContainer.hide();
-                this.view.$resultsContainer.find('tbody').empty();
+                this.view.$resultsContainer.find('.search-items').empty();
             }
         },
 
@@ -472,9 +481,10 @@ define([
         },
 
         onShowPanel: function () {
+            this.onSelectSearchingResults(true);
             if (this.resultItems && this.resultItems.length > 0 && !this._state.isStartedAddingResults) {
                 var me = this,
-                    $tableBody = this.view.$resultsContainer.find('tbody');
+                    $tableBody = this.view.$resultsContainer.find('.search-items');
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
                     var $item = $(item.el).appendTo($tableBody);
@@ -493,6 +503,16 @@ define([
 
         onHidePanel: function () {
             this.hideResults();
+            this.onSelectSearchingResults(false);
+        },
+
+        onSelectSearchingResults: function (val) {
+            if (!val && this.getApplication().getController('LeftMenu').isSearchPanelVisible()) return;
+
+            if (this._state.isHighlightedResults !== val) {
+                this.api.asc_selectSearchingResults(val);
+                this._state.isHighlightedResults = val;
+            }
         },
 
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index a4dd9ad5f..96e8514ee 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -662,6 +662,11 @@
 }
 
 .search-panel {
+    #search-options {
+        label {
+            width: 100%;
+        }
+    }
     #search-results {
         padding-top: 6px;
         .search-table {
@@ -687,7 +692,7 @@
         .search-items {
             height: calc(100% - 24px);
             position: absolute;
-            top: 24px;
+            top: 23px;
             width: 100%;
             overflow: hidden;
             .item {

From c9c77487b7f31ba74184b973f0f9430482950512 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 12 Apr 2022 17:08:08 +0300
Subject: [PATCH 38/52] [DE PE SSE] Fix search

---
 apps/common/main/lib/view/Header.js                   |  7 ++++++-
 apps/common/main/lib/view/SearchPanel.js              | 11 ++++++++---
 apps/common/main/resources/less/searchdialog.less     |  1 +
 apps/documenteditor/main/app/controller/Search.js     |  6 ++++++
 apps/documenteditor/main/app/view/LeftMenu.js         |  2 +-
 apps/documenteditor/main/locale/en.json               |  1 +
 apps/presentationeditor/main/app/controller/Search.js |  6 ++++++
 apps/presentationeditor/main/app/view/LeftMenu.js     |  2 +-
 apps/presentationeditor/main/locale/en.json           |  1 +
 apps/spreadsheeteditor/main/app/view/LeftMenu.js      |  2 +-
 apps/spreadsheeteditor/main/locale/en.json            |  1 +
 11 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 6622a1fa8..30745fa1c 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -356,6 +356,10 @@ define([
 
             if ( me.btnOptions )
                 me.btnOptions.updateHint(me.tipViewSettings);
+
+            if (me.btnSearch)
+                me.btnSearch.updateHint(me.tipSearch +  Common.Utils.String.platformKey('Ctrl+F'));
+
         }
 
         function onFocusDocName(e){
@@ -870,7 +874,8 @@ define([
             tipViewSettings: 'View Settings',
             textRemoveFavorite: 'Remove from Favorites',
             textAddFavorite: 'Mark as favorite',
-            textHideNotes: 'Hide Notes'
+            textHideNotes: 'Hide Notes',
+            tipSearch: 'Search'
         }
     }(), Common.Views.Header || {}))
 });
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 6e718be65..9fd890c29 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -86,13 +86,11 @@ define([
                     style: 'width: 100%;'
                 });
 
-                this.$reaultsNumber = $('#search-adv-results-number');
-                this.updateResultsNumber('no-results');
-
                 this.btnBack = new Common.UI.Button({
                     parentEl: $('#search-adv-back'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-arrow-up',
+                    hint: this.tipPreviousResult,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
@@ -102,6 +100,7 @@ define([
                     parentEl: $('#search-adv-next'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-arrow-down',
+                    hint: this.tipNextResult,
                     dataHint: '1',
                     dataHintDirection: 'bottom'
                 });
@@ -117,6 +116,9 @@ define([
                 });
                 this.btnReplaceAll.on('click', _.bind(this.onReplaceClick, this, 'replaceall'));
 
+                this.$reaultsNumber = $('#search-adv-results-number');
+                this.updateResultsNumber('no-results');
+
                 this.chCaseSensitive = new Common.UI.CheckBox({
                     el: $('#search-adv-case-sensitive'),
                     labelText: this.textCaseSensitive,
@@ -310,6 +312,7 @@ define([
                 text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
             }
             this.$reaultsNumber.text(text);
+            this.disableReplaceButtons(!count);
         },
 
         onClickClosePanel: function() {
@@ -387,6 +390,8 @@ define([
         textNoSearchResults: 'No search results',
         textItemEntireCell: 'Entire cell contents',
         textTooManyResults: 'There are too many results to show here',
+        tipPreviousResult: 'Previous result',
+        tipNextResult: 'Next result',
         textName: 'Name',
         textCell: 'Cell',
         textValue: 'Value',
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index d4de49286..8e0ec2cab 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -221,6 +221,7 @@
         .item {
             padding: 6px 15px;
             word-break: break-all;
+            cursor: pointer;
 
             &:hover {
                 background-color: @highlight-button-hover-ie;
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 0bf486d19..37ec57ebf 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -121,6 +121,12 @@ define([
                     this._state.useRegExp = checked;
                     break;
             }
+            if (this._state.searchText !== '' && this.onQuerySearch()) {
+                this.hideResults();
+                clearInterval(this.searchTimer);
+                this.searchTimer = undefined;
+                this.api.asc_StartTextAroundSearch();
+            }
         },
 
         onSearchNext: function (type, text, e) {
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 7d9bf9644..49e9ea585 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -108,7 +108,7 @@ define([
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                hint: this.tipSearch,
                 disabled: true,
                 enableToggle: true,
                 toggleGroup: 'leftMenuGroup'
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 6bce19a56..c1f62eef2 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -296,6 +296,7 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.Header.tipSearch": "Search",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 4b02f1fce..82efb20ef 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -118,6 +118,12 @@ define([
                     this._state.useRegExp = checked;
                     break;
             }
+            if (this._state.searchText !== '' && this.onQuerySearch()) {
+                this.hideResults();
+                clearInterval(this.searchTimer);
+                this.searchTimer = undefined;
+                this.api.asc_StartTextAroundSearch();
+            }
         },
 
         onSearchNext: function (type, text, e) {
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index cd1861b3b..84674b0d4 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -104,7 +104,7 @@ define([
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                hint: this.tipSearch,
                 disabled: true,
                 enableToggle: true,
                 toggleGroup: 'leftMenuGroup'
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index cb91ef684..b89850e4c 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -381,6 +381,7 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.Header.tipSearch": "Search",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
index 77616b502..ce50023c7 100644
--- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
@@ -94,7 +94,7 @@ define([
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
+                hint: this.tipSearch,
                 disabled: true,
                 enableToggle: true,
                 toggleGroup: 'leftMenuGroup'
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 7c9036c81..978481d00 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -237,6 +237,7 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.Header.tipSearch": "Search",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",

From 5696c4820dd9709266ab8e575a2557a657a4c3aa Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 12 Apr 2022 18:15:30 +0300
Subject: [PATCH 39/52] [DE PE SSE] Add translations for new search

---
 apps/common/main/lib/view/SearchBar.js      | 18 ++++++---
 apps/documenteditor/main/locale/en.json     | 22 +++++++++++
 apps/presentationeditor/main/locale/en.json | 22 +++++++++++
 apps/spreadsheeteditor/main/locale/en.json  | 41 +++++++++++++++++++++
 4 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index 9cdc8b195..e14ee235b 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -90,28 +90,32 @@ define([
             this.btnBack = new Common.UI.Button({
                 parentEl: $('#search-bar-back'),
                 cls: 'btn-toolbar',
-                iconCls: 'toolbar__icon btn-arrow-up'
+                iconCls: 'toolbar__icon btn-arrow-up',
+                hint: this.tipPreviousResult
             });
             this.btnBack.on('click', _.bind(this.onBtnNextClick, this, 'back'));
 
             this.btnNext = new Common.UI.Button({
                 parentEl: $('#search-bar-next'),
                 cls: 'btn-toolbar',
-                iconCls: 'toolbar__icon btn-arrow-down'
+                iconCls: 'toolbar__icon btn-arrow-down',
+                hint: this.tipNextResult
             });
             this.btnNext.on('click', _.bind(this.onBtnNextClick, this, 'next'));
 
             this.btnOpenPanel = new Common.UI.Button({
                 parentEl: $('#search-bar-open-panel'),
                 cls: 'btn-toolbar',
-                iconCls: 'toolbar__icon more-vertical'
+                iconCls: 'toolbar__icon more-vertical',
+                hint: this.tipOpenAdvancedSettings
             });
             this.btnOpenPanel.on('click', _.bind(this.onOpenPanel, this));
 
             this.btnClose = new Common.UI.Button({
                 parentEl: $('#search-bar-close'),
                 cls: 'btn-toolbar',
-                iconCls: 'toolbar__icon btn-close'
+                iconCls: 'toolbar__icon btn-close',
+                hint: this.tipCloseSearch
             });
             this.btnClose.on('click', _.bind(function () {
                 this.hide();
@@ -180,7 +184,11 @@ define([
             this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
         },
 
-        textFind: 'Find'
+        textFind: 'Find',
+        tipPreviousResult: 'Previous result',
+        tipNextResult: 'Next result',
+        tipOpenAdvancedSettings: 'Open advanced settings',
+        tipCloseSearch: 'Close search'
 
     }, Common.UI.SearchBar || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index c1f62eef2..562ebecc3 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -198,6 +198,11 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
+  "Common.UI.SearchBar.textFind": "Find",
+  "Common.UI.SearchBar.tipPreviousResult": "Previous result",
+  "Common.UI.SearchBar.tipNextResult": "Next result",
+  "Common.UI.SearchBar.tipOpenAdvancedSettings": "Open advanced settings",
+  "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -502,6 +507,21 @@
   "Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
   "Common.Views.UserNameDialog.textLabel": "Label:",
   "Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
+  "Common.Views.SearchPanel.textFind": "Find",
+  "Common.Views.SearchPanel.textFindAndReplace": "Find and replace",
+  "Common.Views.SearchPanel.textCloseSearch": "Close search",
+  "Common.Views.SearchPanel.textReplace": "Replace",
+  "Common.Views.SearchPanel.textReplaceAll": "Replace All",
+  "Common.Views.SearchPanel.textSearchResults": "Search results: {0}/{1}",
+  "Common.Views.SearchPanel.textReplaceWith": "Replace with",
+  "Common.Views.SearchPanel.textCaseSensitive": "Case sensitive",
+  "Common.Views.SearchPanel.textMatchUsingRegExp": "Match using regular expressions",
+  "Common.Views.SearchPanel.textWholeWords": "Whole words only",
+  "Common.Views.SearchPanel.textNoMatches": "No matches",
+  "Common.Views.SearchPanel.textNoSearchResults": "No search results",
+  "Common.Views.SearchPanel.textTooManyResults": "There are too many results to show here",
+  "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.tipNextResult": "Next result",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -1250,6 +1270,8 @@
   "DE.Controllers.Viewport.textFitPage": "Fit to Page",
   "DE.Controllers.Viewport.textFitWidth": "Fit to Width",
   "DE.Controllers.Viewport.txtDarkMode": "Dark mode",
+  "DE.Controllers.Search.notcriticalErrorTitle": "Warning",
+  "DE.Controllers.Search.warnReplaceString": "{0} is not a valid special character for the Replace With box.",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
   "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Label must not be empty.",
   "DE.Views.BookmarksDialog.textAdd": "Add",
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index b89850e4c..7d802647a 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -280,6 +280,11 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
+  "Common.UI.SearchBar.textFind": "Find",
+  "Common.UI.SearchBar.tipPreviousResult": "Previous result",
+  "Common.UI.SearchBar.tipNextResult": "Next result",
+  "Common.UI.SearchBar.tipOpenAdvancedSettings": "Open advanced settings",
+  "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -570,6 +575,21 @@
   "Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
   "Common.Views.UserNameDialog.textLabel": "Label:",
   "Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
+  "Common.Views.SearchPanel.textFind": "Find",
+  "Common.Views.SearchPanel.textFindAndReplace": "Find and replace",
+  "Common.Views.SearchPanel.textCloseSearch": "Close search",
+  "Common.Views.SearchPanel.textReplace": "Replace",
+  "Common.Views.SearchPanel.textReplaceAll": "Replace All",
+  "Common.Views.SearchPanel.textSearchResults": "Search results: {0}/{1}",
+  "Common.Views.SearchPanel.textReplaceWith": "Replace with",
+  "Common.Views.SearchPanel.textCaseSensitive": "Case sensitive",
+  "Common.Views.SearchPanel.textMatchUsingRegExp": "Match using regular expressions",
+  "Common.Views.SearchPanel.textWholeWords": "Whole words only",
+  "Common.Views.SearchPanel.textNoMatches": "No matches",
+  "Common.Views.SearchPanel.textNoSearchResults": "No search results",
+  "Common.Views.SearchPanel.textTooManyResults": "There are too many results to show here",
+  "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.tipNextResult": "Next result",
   "PE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
   "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -1286,6 +1306,8 @@
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Controllers.Viewport.textFitPage": "Fit to Slide",
   "PE.Controllers.Viewport.textFitWidth": "Fit to Width",
+  "PE.Controllers.Search.notcriticalErrorTitle": "Warning",
+  "PE.Controllers.Search.warnReplaceString": "{0} is not a valid special character for the Replace With box.",
   "PE.Views.Animation.strDelay": "Delay",
   "PE.Views.Animation.strDuration": "Duration",
   "PE.Views.Animation.strRepeat": "Repeat",
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 978481d00..f5314dbfe 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -143,6 +143,11 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
+  "Common.UI.SearchBar.textFind": "Find",
+  "Common.UI.SearchBar.tipPreviousResult": "Previous result",
+  "Common.UI.SearchBar.tipNextResult": "Next result",
+  "Common.UI.SearchBar.tipOpenAdvancedSettings": "Open advanced settings",
+  "Common.UI.SearchBar.tipCloseSearch": "Close search",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -431,6 +436,38 @@
   "Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
   "Common.Views.UserNameDialog.textLabel": "Label:",
   "Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
+  "Common.Views.SearchPanel.textFind": "Find",
+  "Common.Views.SearchPanel.textFindAndReplace": "Find and replace",
+  "Common.Views.SearchPanel.textCloseSearch": "Close search",
+  "Common.Views.SearchPanel.textReplace": "Replace",
+  "Common.Views.SearchPanel.textReplaceAll": "Replace All",
+  "Common.Views.SearchPanel.textSearchResults": "Search results: {0}/{1}",
+  "Common.Views.SearchPanel.textReplaceWith": "Replace with",
+  "Common.Views.SearchPanel.textCaseSensitive": "Case sensitive",
+  "Common.Views.SearchPanel.textMatchUsingRegExp": "Match using regular expressions",
+  "Common.Views.SearchPanel.textWholeWords": "Whole words only",
+  "Common.Views.SearchPanel.textWithin": "Within",
+  "Common.Views.SearchPanel.textSelectDataRange": "Select Data range",
+  "Common.Views.SearchPanel.textSearch": "Search",
+  "Common.Views.SearchPanel.textLookIn": "Look in",
+  "Common.Views.SearchPanel.textSheet": "Sheet",
+  "Common.Views.SearchPanel.textWorkbook": "Workbook",
+  "Common.Views.SearchPanel.textSpecificRange": "Specific range",
+  "Common.Views.SearchPanel.textByRows": "By rows",
+  "Common.Views.SearchPanel.textByColumns": "By columns",
+  "Common.Views.SearchPanel.textFormulas": "Formulas",
+  "Common.Views.SearchPanel.textValues": "Values",
+  "Common.Views.SearchPanel.textSearchOptions": "Search options",
+  "Common.Views.SearchPanel.textNoMatches": "No matches",
+  "Common.Views.SearchPanel.textNoSearchResults": "No search results",
+  "Common.Views.SearchPanel.textItemEntireCell": "Entire cell contents",
+  "Common.Views.SearchPanel.textTooManyResults": "There are too many results to show here",
+  "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.tipNextResult": "Next result",
+  "Common.Views.SearchPanel.textName": "Name",
+  "Common.Views.SearchPanel.textCell": "Cell",
+  "Common.Views.SearchPanel.textValue": "Value",
+  "Common.Views.SearchPanel.textFormula": "Formula",
   "SSE.Controllers.DataTab.textColumns": "Columns",
   "SSE.Controllers.DataTab.textEmptyUrl": "You need to specify URL.",
   "SSE.Controllers.DataTab.textRows": "Rows",
@@ -1439,6 +1476,10 @@
   "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar",
   "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines",
   "SSE.Controllers.Viewport.textHideHeadings": "Hide Headings",
+  "SSE.Controllers.Search.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
+  "SSE.Controllers.Search.textReplaceSuccess": "Search has been done. {0} occurrences have been replaced",
+  "SSE.Controllers.Search.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+  "SSE.Controllers.Search.textInvalidRange": "ERROR! Invalid cells range",
   "SSE.Views.AdvancedSeparatorDialog.strDecimalSeparator": "Decimal separator",
   "SSE.Views.AdvancedSeparatorDialog.strThousandsSeparator": "Thousands separator",
   "SSE.Views.AdvancedSeparatorDialog.textLabel": "Settings used to recognize numeric data",

From e57fed6bc86d0b936506a204cd2ed3a02cc53bcb Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 12 Apr 2022 21:26:58 +0300
Subject: [PATCH 40/52] [DE PE SSE] Remove unused code

---
 .../main/app/controller/LeftMenu.js           | 102 -----------
 .../main/app/template/LeftMenu.template       |   1 -
 apps/documenteditor/main/app/view/LeftMenu.js |  13 --
 .../main/app/controller/LeftMenu.js           | 104 -----------
 .../main/app/template/LeftMenu.template       |   1 -
 .../main/app/view/LeftMenu.js                 |  13 --
 .../main/app/controller/LeftMenu.js           | 173 ------------------
 .../main/app/template/LeftMenu.template       |   1 -
 .../main/app/view/LeftMenu.js                 |  13 --
 9 files changed, 421 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 2276dedc2..84fd58d81 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -97,14 +97,6 @@ define([
                     'file:close': this.clickToolbarTab.bind(this, 'other'),
                     'save:disabled': this.changeToolbarSaveState.bind(this)
                 },
-                'SearchDialog': {
-                    'hide': _.bind(this.onSearchDlgHide, this),
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
-                    'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this),
-                    'search:highlight': _.bind(this.onSearchHighlight, this)
-                },
                 'Common.Views.ReviewChanges': {
                     'collaboration:chat': _.bind(this.onShowHideChat, this)
                 },
@@ -126,7 +118,6 @@ define([
 
         onLaunch: function() {
             this.leftMenu = this.createView('LeftMenu').render();
-            this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
             this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
 
             Common.util.Shortcuts.delegateShortcuts({
@@ -149,7 +140,6 @@ define([
 
         setApi: function(api) {
             this.api = api;
-            this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this));
             this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
             Common.NotificationCenter.on('api:disconnect',               _.bind(this.onApiServerDisconnect, this));
             this.api.asc_registerCallback('asc_onDownloadUrl',           _.bind(this.onDownloadUrl, this));
@@ -564,86 +554,6 @@ define([
         },
         /** coauthoring end **/
 
-        onQuerySearch: function(d, w, opts) {
-            if (opts.textsearch && opts.textsearch.length) {
-                if (!this.api.asc_findText(opts.textsearch, d != 'back', opts.matchcase, opts.matchword)) {
-                    var me = this;
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            }
-        },
-
-        onQueryReplace: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase, opts.matchword)) {
-                    var me = this;
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            }
-        },
-
-        onQueryReplaceAll: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase, opts.matchword);
-            }
-        },
-
-        onSearchHighlight: function(w, highlight) {
-            this.api.asc_selectSearchingResults(highlight);
-        },
-
-        showSearchDlg: function(show,action) {
-            if ( !this.dlgSearch ) {
-                this.dlgSearch = (new Common.UI.SearchDialog({
-                    matchcase: true,
-                    markresult: {applied: true}
-                }));
-            }
-
-            if (show) {
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-                if (this.dlgSearch.isVisible()) {
-                    this.dlgSearch.setMode(mode);
-                    this.dlgSearch.setSearchText(this.api.asc_GetSelectedText());
-                    this.dlgSearch.focus();
-                } else {
-                    this.dlgSearch.show(mode, this.api.asc_GetSelectedText());
-                }
-            } else this.dlgSearch['hide']();
-        },
-
-        onMenuSearch: function(obj, show) {
-            this.showSearchDlg(show);
-        },
-
-        onSearchDlgHide: function() {
-            this.leftMenu.btnSearch.toggle(false, true);
-            this.api.asc_selectSearchingResults(false);
-            $(this.leftMenu.btnSearch.el).blur();
-            this.api.asc_enableKeyEvents(true);
-        },
-
-        onApiTextReplaced: function(found,replaced) {
-            var me = this;
-            if (found) {
-                !(found - replaced > 0) ?
-                    Common.UI.info( {msg: Common.Utils.String.format(this.textReplaceSuccess, replaced)} ) :
-                    Common.UI.warning( {msg: Common.Utils.String.format(this.textReplaceSkipped, found-replaced)} );
-            } else {
-                Common.UI.info({msg: this.textNoTextFound});
-            }
-        },
-
         onApiServerDisconnect: function(enableDownload) {
             this.mode.isEdit = false;
             this.leftMenu.close();
@@ -656,18 +566,12 @@ define([
             this.leftMenu.btnNavigation.setDisabled(true);
 
             this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
-            if ( this.dlgSearch ) {
-                this.leftMenu.btnSearch.toggle(false, true);
-                this.dlgSearch['hide']();
-            }
         },
 
         setPreviewMode: function(mode) {
             if (this.viewmode === mode) return;
             this.viewmode = mode;
 
-            this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
-
             this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
@@ -762,12 +666,6 @@ define([
         },
 
         menuFilesShowHide: function(state) {
-            if ( this.dlgSearch ) {
-                if ( state == 'show' )
-                    this.dlgSearch.suspendKeyEvents();
-                else
-                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents, this.dlgSearch);
-            }
             if (this.api && state == 'hide')
                 this.api.asc_enableKeyEvents(true);
         },
diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template
index f1b280f03..fa0abf7c2 100644
--- a/apps/documenteditor/main/app/template/LeftMenu.template
+++ b/apps/documenteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,5 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-search" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 49e9ea585..46f629aaa 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -97,14 +97,6 @@ define([
         render: function () {
             var $markup = $(this.template({}));
 
-            this.btnSearch = new Common.UI.Button({
-                action: 'search',
-                el: $markup.elementById('#left-btn-search'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
-                disabled: true,
-                enableToggle: true
-            });
-
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
@@ -174,7 +166,6 @@ define([
             });
             this.btnNavigation.on('click',         this.onBtnMenuClick.bind(this));
 
-            this.btnSearch.on('click',          this.onBtnMenuClick.bind(this));
             this.btnSearchBar.on('click',       this.onBtnMenuClick.bind(this));
             this.btnAbout.on('toggle',          this.onBtnMenuToggle.bind(this));
 
@@ -202,9 +193,6 @@ define([
                 btn.panel['show']();
                 if (!this._state.pluginIsRunning)
                     this.$el.width(SCALE_MIN);
-
-                if (this.btnSearch.isActive())
-                    this.btnSearch.toggle(false);
             } else {
                 btn.panel['hide']();
             }
@@ -370,7 +358,6 @@ define([
         },
 
         disableMenu: function(menu, disable) {
-            this.btnSearch.setDisabled(false);
             this.btnSearchBar.setDisabled(false);
             this.btnAbout.setDisabled(false);
             this.btnSupport.setDisabled(false);
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index f8091b677..f397fa3b6 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -82,8 +82,6 @@ define([
                     'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
                 },
                 'FileMenu': {
-                    'menu:hide': _.bind(this.menuFilesShowHide, this, 'hide'),
-                    'menu:show': _.bind(this.menuFilesShowHide, this, 'show'),
                     'filemenu:hide': _.bind(this.menuFilesHide, this),
                     'item:click': _.bind(this.clickMenuFileItem, this),
                     'saveas:format': _.bind(this.clickSaveAsFormat, this),
@@ -98,13 +96,6 @@ define([
                     'file:close': this.clickToolbarTab.bind(this, 'other'),
                     'save:disabled' : this.changeToolbarSaveState.bind(this)
                 },
-                'SearchDialog': {
-                    'hide': _.bind(this.onSearchDlgHide, this),
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
-                    'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this)
-                },
                 'Common.Views.ReviewChanges': {
                     'collaboration:chat': _.bind(this.onShowHideChat, this)
                 },
@@ -121,7 +112,6 @@ define([
 
         onLaunch: function() {
             this.leftMenu = this.createView('LeftMenu').render();
-            this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
             this.leftMenu.btnThumbs.on('toggle', _.bind(this.onShowTumbnails, this));
             this.isThumbsShown = true;
             this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
@@ -150,7 +140,6 @@ define([
             this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
             Common.NotificationCenter.on('api:disconnect',               _.bind(this.onApiServerDisconnect, this));
             this.api.asc_registerCallback('asc_onDownloadUrl',           _.bind(this.onDownloadUrl, this));
-            this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this));
             /** coauthoring begin **/
             if (this.mode.canCoAuthoring) {
                 if (this.mode.canChat)
@@ -442,66 +431,6 @@ define([
         },
         /** coauthoring end **/
 
-        onQuerySearch: function(d, w, opts) {
-            if (opts.textsearch && opts.textsearch.length) {
-                if (!this.api.findText(opts.textsearch, d != 'back', opts.matchcase)) {
-                    var me = this;
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            }
-        },
-
-        onQueryReplace: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                if (!this.api.asc_replaceText(opts.textsearch, opts.textreplace, false, opts.matchcase)) {
-                    var me = this;
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            }
-        },
-
-        onQueryReplaceAll: function(w, opts) {
-            if (!_.isEmpty(opts.textsearch)) {
-                this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase);
-            }
-        },
-
-        showSearchDlg: function(show,action) {
-            if ( !this.dlgSearch ) {
-                this.dlgSearch = (new Common.UI.SearchDialog({
-                    matchcase: true
-                }));
-                var me = this;
-                Common.NotificationCenter.on('preview:start', function() {
-                    me.dlgSearch.hide();
-                });
-            }
-
-            if (show) {
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-                if (this.dlgSearch.isVisible()) {
-                    this.dlgSearch.setMode(mode);
-                    this.dlgSearch.focus();
-                } else {
-                    this.dlgSearch.show(mode);
-                }
-            } else this.dlgSearch['hide']();
-        },
-
-        onMenuSearch: function(obj, show) {
-            this.showSearchDlg(show);
-        },
-
         onShowTumbnails: function(obj, show) {
             this.api.ShowThumbnails(show);
 
@@ -515,30 +444,10 @@ define([
             this.isThumbsShown = isShow;
         },
 
-        onSearchDlgHide: function() {
-            this.leftMenu.btnSearch.toggle(false, true);
-            $(this.leftMenu.btnSearch.el).blur();
-            this.api.asc_enableKeyEvents(true);
-//            this.api.asc_selectSearchingResults(false);
-        },
-
-        onApiTextReplaced: function(found,replaced) {
-            var me = this;
-            if (found) {
-                !(found - replaced > 0) ?
-                    Common.UI.info( {msg: Common.Utils.String.format(this.textReplaceSuccess, replaced)} ) :
-                    Common.UI.warning( {msg: Common.Utils.String.format(this.textReplaceSkipped, found-replaced)} );
-            } else {
-                Common.UI.info({msg: this.textNoTextFound});
-            }
-        },
-
         setPreviewMode: function(mode) {
             if (this.viewmode === mode) return;
             this.viewmode = mode;
 
-            this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
-
             this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
@@ -553,10 +462,6 @@ define([
             this.leftMenu.btnPlugins.setDisabled(true);
 
             this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
-            if ( this.dlgSearch ) {
-                this.leftMenu.btnSearch.toggle(false, true);
-                this.dlgSearch['hide']();
-            }
         },
 
         onApiCountPages: function(count) {
@@ -628,15 +533,6 @@ define([
             }
         },
 
-        menuFilesShowHide: function(state) {
-            if ( this.dlgSearch ) {
-                if ( state == 'show' )
-                    this.dlgSearch.suspendKeyEvents();
-                else
-                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents, this.dlgSearch);
-            }
-        },
-
         onShortcut: function(s, e) {
             if (!this.mode) return;
 
diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template
index 384fc8c88..18cca4c88 100644
--- a/apps/presentationeditor/main/app/template/LeftMenu.template
+++ b/apps/presentationeditor/main/app/template/LeftMenu.template
@@ -1,6 +1,5 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-search" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index 84674b0d4..1dd9e130c 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -93,14 +93,6 @@ define([
         render: function () {
             var $markup = $(this.template({}));
 
-            this.btnSearch = new Common.UI.Button({
-                action: 'search',
-                el: $markup.elementById('#left-btn-search'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
-                disabled: true,
-                enableToggle: true
-            });
-
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
@@ -168,8 +160,6 @@ define([
             });
             this.btnPlugins.hide();
             this.btnPlugins.on('click',         _.bind(this.onBtnMenuClick, this));
-            
-            this.btnSearch.on('click',          _.bind(this.onBtnMenuClick, this));
             this.btnSearchBar.on('click',       _.bind(this.onBtnMenuClick, this));
             this.btnThumbs.on('click',          _.bind(this.onBtnMenuClick, this));
             this.btnAbout.on('toggle',          _.bind(this.onBtnMenuToggle, this));
@@ -187,9 +177,6 @@ define([
                 btn.panel['show']();
                 if (!this._state.pluginIsRunning)
                     this.$el.width(SCALE_MIN);
-
-                if (this.btnSearch.isActive())
-                    this.btnSearch.toggle(false);
             } else {
                 btn.panel['hide']();
             }
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index f5c56da32..723ca475d 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -89,14 +89,6 @@ define([
                     'file:close': this.clickToolbarTab.bind(this, 'other'),
                     'save:disabled' : this.changeToolbarSaveState.bind(this)
                 },
-                'SearchDialog': {
-                    'hide': _.bind(this.onSearchDlgHide, this),
-                    'search:back': _.bind(this.onQuerySearch, this, 'back'),
-                    'search:next': _.bind(this.onQuerySearch, this, 'next'),
-                    'search:replace': _.bind(this.onQueryReplace, this),
-                    'search:replaceall': _.bind(this.onQueryReplaceAll, this),
-                    'search:highlight': _.bind(this.onSearchHighlight, this)
-                },
                 'Common.Views.ReviewChanges': {
                     'collaboration:chat': _.bind(this.onShowHideChat, this)
                 },
@@ -115,7 +107,6 @@ define([
 
         onLaunch: function() {
             this.leftMenu = this.createView('LeftMenu').render();
-            this.leftMenu.btnSearch.on('toggle', _.bind(this.onMenuSearch, this));
             this.leftMenu.btnSearchBar.on('toggle', _.bind(this.onMenuSearchBar, this));
 
             Common.util.Shortcuts.delegateShortcuts({
@@ -560,170 +551,10 @@ define([
         },
         /** coauthoring end **/
 
-        onQuerySearch: function(d, w, opts) {
-            // if (opts.textsearch && opts.textsearch.length) {
-                var options = this.dlgSearch.findOptions;
-                options.asc_setFindWhat(opts.textsearch);
-                options.asc_setScanForward(d != 'back');
-                options.asc_setIsMatchCase(opts.matchcase);
-                options.asc_setIsWholeCell(opts.matchword);
-                options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-                options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-                options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
-
-                if (!this.api.asc_findText(options)) {
-                    var me = this;
-                    Common.UI.info({
-                        msg: this.textNoTextFound,
-                        callback: function() {
-                            me.dlgSearch.focus();
-                        }
-                    });
-                }
-            // }
-        },
-
-        onQueryReplace: function(w, opts) {
-            // if (!_.isEmpty(opts.textsearch)) {
-                this.api.isReplaceAll = false;
-
-                var options = this.dlgSearch.findOptions;
-                options.asc_setFindWhat(opts.textsearch);
-                options.asc_setReplaceWith(opts.textreplace);
-                options.asc_setIsMatchCase(opts.matchcase);
-                options.asc_setIsWholeCell(opts.matchword);
-                options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-                options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-                options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
-                options.asc_setIsReplaceAll(false);
-
-                this.api.asc_replaceText(options);
-            // }
-        },
-
-        onQueryReplaceAll: function(w, opts) {
-            // if (!_.isEmpty(opts.textsearch)) {
-                this.api.isReplaceAll = true;
-
-                var options = this.dlgSearch.findOptions;
-                options.asc_setFindWhat(opts.textsearch);
-                options.asc_setReplaceWith(opts.textreplace);
-                options.asc_setIsMatchCase(opts.matchcase);
-                options.asc_setIsWholeCell(opts.matchword);
-                options.asc_setScanOnOnlySheet(this.dlgSearch.menuWithin.menu.items[0].checked);
-                options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
-                options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
-                options.asc_setIsReplaceAll(true);
-
-                this.api.asc_replaceText(options);
-            // }
-        },
-
-        onSearchHighlight: function(w, highlight) {
-            this.api.asc_selectSearchingResults(highlight);
-        },
-
-        showSearchDlg: function(show,action) {
-            if ( !this.dlgSearch ) {
-                var menuWithin = new Common.UI.MenuItem({
-                    caption     : this.textWithin,
-                    menu        : new Common.UI.Menu({
-                        menuAlign   : 'tl-tr',
-                        items       : [{
-                                caption     : this.textSheet,
-                                toggleGroup : 'searchWithih',
-                                checkable   : true,
-                                checked     : true
-                            },{
-                                caption     : this.textWorkbook,
-                                toggleGroup : 'searchWithih',
-                                checkable   : true,
-                                checked     : false
-                        }]
-                    })
-                });
-
-                var menuSearch = new Common.UI.MenuItem({
-                    caption     : this.textSearch,
-                    menu        : new Common.UI.Menu({
-                        menuAlign   : 'tl-tr',
-                        items       : [{
-                                caption     : this.textByRows,
-                                toggleGroup : 'searchByrows',
-                                checkable   : true,
-                                checked     : true
-                            },{
-                                caption     : this.textByColumns,
-                                toggleGroup : 'searchByrows',
-                                checkable   : true,
-                                checked     : false
-                        }]
-                    })
-                });
-
-                var menuLookin = new Common.UI.MenuItem({
-                    caption     : this.textLookin,
-                    menu        : new Common.UI.Menu({
-                        menuAlign   : 'tl-tr',
-                        items       : [{
-                                caption     : this.textFormulas,
-                                toggleGroup : 'searchLookin',
-                                checkable   : true,
-                                checked     : true
-                            },{
-                                caption     : this.textValues,
-                                toggleGroup : 'searchLookin',
-                                checkable   : true,
-                                checked     : false
-                        }]
-                    })
-                });
-
-                this.dlgSearch = (new Common.UI.SearchDialog({
-                    matchcase: true,
-                    matchword: true,
-                    matchwordstr: this.textItemEntireCell,
-                    markresult: {applied: true},
-                    extraoptions : [menuWithin,menuSearch,menuLookin]
-                }));
-
-                this.dlgSearch.menuWithin = menuWithin;
-                this.dlgSearch.menuSearch = menuSearch;
-                this.dlgSearch.menuLookin = menuLookin;
-                this.dlgSearch.findOptions = new Asc.asc_CFindOptions();
-            }
-
-            if (show) {
-                var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
-
-                if (this.dlgSearch.isVisible()) {
-                    this.dlgSearch.setMode(mode);
-                    this.dlgSearch.focus();
-                } else {
-                    this.dlgSearch.show(mode);
-                }
-
-                this.api.asc_closeCellEditor();
-            } else this.dlgSearch['hide']();
-        },
-
-        onMenuSearch: function(obj, show) {
-            this.showSearchDlg(show);
-        },
-
-        onSearchDlgHide: function() {
-            this.leftMenu.btnSearch.toggle(false, true);
-            this.api.asc_selectSearchingResults(false);
-            $(this.leftMenu.btnSearch.el).blur();
-            this.api.asc_enableKeyEvents(true);
-        },
-
         setPreviewMode: function(mode) {
             if (this.viewmode === mode) return;
             this.viewmode = mode;
 
-            this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
-
             this.leftMenu.panelSearch && this.leftMenu.panelSearch.setSearchMode(this.viewmode ? 'no-replace' : 'search');
         },
 
@@ -739,10 +570,6 @@ define([
             this.leftMenu.btnSpellcheck.setDisabled(true);
 
             this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
-            if ( this.dlgSearch ) {
-                this.leftMenu.btnSearch.toggle(false, true);
-                this.dlgSearch['hide']();
-            }
         },
 
         /** coauthoring begin **/
diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
index b9c3925ce..2b2b9aac0 100644
--- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,5 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-search" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
index ce50023c7..cbcc13535 100644
--- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
@@ -83,14 +83,6 @@ define([
         render: function () {
             var $markup = $(this.template({}));
 
-            this.btnSearch = new Common.UI.Button({
-                action: 'search',
-                el: $markup.elementById('#left-btn-search'),
-                hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
-                disabled: true,
-                enableToggle: true
-            });
-
             this.btnSearchBar = new Common.UI.Button({
                 action: 'advancedsearch',
                 el: $markup.elementById('#left-btn-searchbar'),
@@ -161,7 +153,6 @@ define([
             this.btnSpellcheck.hide();
             this.btnSpellcheck.on('click',      _.bind(this.onBtnMenuClick, this));
 
-            this.btnSearch.on('click',          _.bind(this.onBtnMenuClick, this));
             this.btnSearchBar.on('click',       _.bind(this.onBtnMenuClick, this));
             this.btnAbout.on('toggle',          _.bind(this.onBtnMenuToggle, this));
 
@@ -177,9 +168,6 @@ define([
                 btn.panel['show']();
                 if (!this._state.pluginIsRunning)
                     this.$el.width(SCALE_MIN);
-
-                if (this.btnSearch.isActive())
-                    this.btnSearch.toggle(false);
             } else {
                 btn.panel['hide']();
             }
@@ -327,7 +315,6 @@ define([
         disableMenu: function(menu, disable) {
             this.btnAbout.setDisabled(false);
             this.btnSupport.setDisabled(false);
-            this.btnSearch.setDisabled(false);
             this.btnSearchBar.setDisabled(false);
             /** coauthoring begin **/
             this.btnComments.setDisabled(false);

From b5ade7b338b0c92fa2a0e6384a96423cb9325de2 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 22 Apr 2022 20:28:15 +0300
Subject: [PATCH 41/52] [DE PE SSE] Fix alt-hints in search panel

---
 apps/common/main/lib/component/InputField.js  |  8 +++-
 .../main/lib/template/SearchPanel.template    |  2 +-
 apps/common/main/lib/view/SearchPanel.js      | 39 +++++++++++++------
 .../main/app/template/LeftMenu.template       |  2 +-
 .../main/app/template/LeftMenu.template       |  2 +-
 .../main/app/template/LeftMenu.template       |  2 +-
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index 28f1d30b6..768d5a00e 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -444,6 +444,9 @@ define([
                         'class="form-control <%= cls %>" ',
                         'placeholder="<%= placeHolder %>" ',
                         'value="<%= value %>"',
+                        'data-hint="<%= dataHint %>"',
+                        'data-hint-offset="<%= dataHintOffset %>"',
+                        'data-hint-direction="<%= dataHintDirection %>"',
                     '>',
                     '<span class="input-error"></span>',
                     '<div class="select-button">' +
@@ -466,7 +469,10 @@ define([
                         placeHolder : this.placeHolder,
                         spellcheck  : this.spellcheck,
                         iconCls     : this.options.iconCls,
-                        scope       : me
+                        scope       : me,
+                        dataHint    : this.options.dataHint,
+                        dataHintOffset: this.options.dataHintOffset,
+                        dataHintDirection: this.options.dataHintDirection
                     }));
 
                     if (parentEl) {
diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template
index 91fdda334..bdba42b87 100644
--- a/apps/common/main/lib/template/SearchPanel.template
+++ b/apps/common/main/lib/template/SearchPanel.template
@@ -31,7 +31,7 @@
                 </tr>
                 <tr class="search-options-block">
                     <td class="padding-large">
-                        <div id="open-search-options">
+                        <div id="open-search-options" data-hint="1" data-hint-direction="left" data-hint-offset="0, -15">
                             <div class="search-options-caret img-commonctrl"></div>
                             <div class="search-options-txt"><%= scope.textSearchOptions %></div>
                         </div>
diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 9fd890c29..1f1d52163 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -70,7 +70,10 @@ define([
                     placeHolder: this.textFind,
                     allowBlank: true,
                     validateOnBlur: false,
-                    style: 'width: 100%;'
+                    style: 'width: 100%;',
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
                 });
                 this.inputText._input.on('input', _.bind(function () {
                     this.fireEvent('search:input', [this.inputText._input.val()]);
@@ -83,7 +86,10 @@ define([
                     placeHolder: this.textReplaceWith,
                     allowBlank: true,
                     validateOnBlur: false,
-                    style: 'width: 100%;'
+                    style: 'width: 100%;',
+                    dataHint: '1',
+                    dataHintDirection: 'left',
+                    dataHintOffset: 'small'
                 });
 
                 this.btnBack = new Common.UI.Button({
@@ -155,7 +161,10 @@ define([
                     parentEl: $('#search-btn-close', this.$el),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-close',
-                    hint: this.textCloseSearch
+                    hint: this.textCloseSearch,
+                    dataHint: '1',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'medium'
                 });
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
 
@@ -174,7 +183,10 @@ define([
                             { value: 0, displayValue: this.textSheet },
                             { value: 1, displayValue: this.textWorkbook },
                             { value: 2, displayValue: this.textSpecificRange}
-                        ]
+                        ],
+                        dataHint: '1',
+                        dataHintDirection: 'bottom',
+                        dataHintOffset: 'big'
                     }).on('selected', function(combo, record) {
                         me.fireEvent('search:options', ['within', record.value]);
                     });
@@ -186,7 +198,10 @@ define([
                         validateOnChange: true,
                         validateOnBlur: true,
                         style: "width: 219px; margin-top: 8px",
-                        disabled: true
+                        disabled: true,
+                        dataHint: '1',
+                        dataHintDirection: 'left',
+                        dataHintOffset: 'small'
                     }).on('keyup:after', function(input, e) {
                         me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]);
                     });
@@ -200,10 +215,11 @@ define([
                         data: [
                             { value: 0, displayValue: this.textByRows },
                             { value: 1, displayValue: this.textByColumns }
-                        ]
+                        ],
+                        dataHint: '1',
+                        dataHintDirection: 'bottom',
+                        dataHintOffset: 'big'
                     }).on('selected', function(combo, record) {
-                        console.log(record.value);
-                        console.log(!record.value);
                         me.fireEvent('search:options', ['search', !record.value]);
                     });
 
@@ -216,10 +232,11 @@ define([
                         data: [
                             { value: 0, displayValue: this.textFormulas },
                             { value: 1, displayValue: this.textValues }
-                        ]
+                        ],
+                        dataHint: '1',
+                        dataHintDirection: 'bottom',
+                        dataHintOffset: 'big'
                     }).on('selected', function(combo, record) {
-                        console.log(record.value);
-                        console.log(!record.value);
                         me.fireEvent('search:options', ['lookIn', !record.value]);
                     });
 
diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template
index fa0abf7c2..342f8f896 100644
--- a/apps/documenteditor/main/app/template/LeftMenu.template
+++ b/apps/documenteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,6 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template
index 18cca4c88..8df024b4f 100644
--- a/apps/presentationeditor/main/app/template/LeftMenu.template
+++ b/apps/presentationeditor/main/app/template/LeftMenu.template
@@ -1,6 +1,6 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
index 2b2b9aac0..75a59f43d 100644
--- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
@@ -1,6 +1,6 @@
 <div id="view-left-menu" class="tool-menu left">
     <div class="tool-menu-btns">
-        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
+        <button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
         <!-- /** coauthoring begin **/ -->
         <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
         <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>

From 4f5ed9778611730d9adfd090d2b5ff1a852dbbfa Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 27 Apr 2022 22:12:59 +0300
Subject: [PATCH 42/52] [embed] Add search bar

---
 apps/common/embed/lib/view/SearchBar.js       |  77 ++++++++
 .../embed/resources/img/icon-menu-sprite.svg  |  20 +-
 apps/common/embed/resources/less/common.less  |  83 +++++++-
 apps/documenteditor/embed/index.html          |   3 +
 .../embed/js/ApplicationController.js         |   8 +
 apps/documenteditor/embed/js/SearchBar.js     | 175 +++++++++++++++++
 apps/presentationeditor/embed/index.html      |   3 +
 .../embed/js/ApplicationController.js         |   7 +
 apps/presentationeditor/embed/js/SearchBar.js | 165 ++++++++++++++++
 apps/spreadsheeteditor/embed/index.html       |   3 +
 .../embed/js/ApplicationController.js         |   7 +
 apps/spreadsheeteditor/embed/js/SearchBar.js  | 179 ++++++++++++++++++
 12 files changed, 728 insertions(+), 2 deletions(-)
 create mode 100644 apps/common/embed/lib/view/SearchBar.js
 create mode 100644 apps/documenteditor/embed/js/SearchBar.js
 create mode 100644 apps/presentationeditor/embed/js/SearchBar.js
 create mode 100644 apps/spreadsheeteditor/embed/js/SearchBar.js

diff --git a/apps/common/embed/lib/view/SearchBar.js b/apps/common/embed/lib/view/SearchBar.js
new file mode 100644
index 000000000..7800e132b
--- /dev/null
+++ b/apps/common/embed/lib/view/SearchBar.js
@@ -0,0 +1,77 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  SearchBar.js
+ *
+ *  Created by Julia Svinareva on 27.04.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+!window.common && (window.common = {});
+!common.view && (common.view = {});
+common.view.SearchBar = new(function() {
+    var tpl = '<div class="asc-window search-window" style="display: none;">' +
+                    '<div class="body">{body}</div>' +
+                '</div>';
+    var tplBody = '<input type="text" id="search-bar-text" placeholder="{textFind}" autocomplete="off">' +
+                '<div class="tools">' +
+                    '<button id="search-bar-back" class="svg-icon search-arrow-up"></button>' +
+                    '<button id="search-bar-next" class="svg-icon search-arrow-down"></button>' +
+                    '<button id="search-bar-close" class="svg-icon search-close"></button>' +
+                '</div>';
+
+    return {
+        create: function(parent) {
+            !parent && (parent = 'body');
+
+            var _$dlg = $(tpl
+                .replace(/\{body}/, tplBody)
+                .replace(/\{textFind}/, this.textFind))
+                    .appendTo(parent)
+                    .attr('id', 'dlg-search');
+
+            return _$dlg;
+        },
+
+        disableNavButtons: function (resultNumber, allResults) {
+            var disable = $('#search-bar-text').val() === '';
+            $('#search-bar-back').attr({disabled: disable || !allResults || resultNumber === 0});
+            $('#search-bar-next').attr({disabled: disable || resultNumber + 1 === allResults});
+        },
+
+        textFind: 'Find'
+
+    };
+})();
\ No newline at end of file
diff --git a/apps/common/embed/resources/img/icon-menu-sprite.svg b/apps/common/embed/resources/img/icon-menu-sprite.svg
index 97b51fd3e..c04600809 100644
--- a/apps/common/embed/resources/img/icon-menu-sprite.svg
+++ b/apps/common/embed/resources/img/icon-menu-sprite.svg
@@ -1,4 +1,4 @@
-<svg width="380" height="40" viewBox="0 0 380 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="440" height="40" viewBox="0 0 440 40" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g id="icon-menu-sprite Embedded Viewer">
 <g id="view-settings">
 <path id="Vector" d="M17 26H3V27H17V26Z" fill="white"/>
@@ -148,5 +148,23 @@
 <g id="close_2">
 <path id="Vector 73_2" d="M366 5L375 14M375 5L366 14" stroke="black" stroke-width="1.5"/>
 </g>
+<g id="search">
+<path id="Union_27" fill-rule="evenodd" clip-rule="evenodd" d="M393 8.5C393 10.9853 390.985 13 388.5 13C386.015 13 384 10.9853 384 8.5C384 6.01472 386.015 4 388.5 4C390.985 4 393 6.01472 393 8.5ZM392.02 12.7266C391.066 13.5217 389.839 14 388.5 14C385.462 14 383 11.5376 383 8.5C383 5.46243 385.462 3 388.5 3C391.538 3 394 5.46243 394 8.5C394 9.83875 393.522 11.0658 392.727 12.0195L396.854 16.1465L396.146 16.8536L392.02 12.7266Z" fill="black"/>
+</g>
+<g id="search_2">
+<path id="Union_28" fill-rule="evenodd" clip-rule="evenodd" d="M393 28.5C393 30.9853 390.985 33 388.5 33C386.015 33 384 30.9853 384 28.5C384 26.0147 386.015 24 388.5 24C390.985 24 393 26.0147 393 28.5ZM392.02 32.7266C391.066 33.5217 389.839 34 388.5 34C385.462 34 383 31.5376 383 28.5C383 25.4624 385.462 23 388.5 23C391.538 23 394 25.4624 394 28.5C394 29.8387 393.522 31.0658 392.727 32.0195L396.854 36.1465L396.146 36.8536L392.02 32.7266Z" fill="white"/>
+</g>
+<g id="arrow-up">
+<path id="Union_29" fill-rule="evenodd" clip-rule="evenodd" d="M410 6.29297L410.354 6.64652L415.854 12.1465L415.146 12.8536L410 7.70718L404.854 12.8536L404.146 12.1465L409.646 6.64652L410 6.29297Z" fill="black"/>
+</g>
+<g id="arrow-up_2">
+<path id="Union_30" fill-rule="evenodd" clip-rule="evenodd" d="M410 26.293L410.354 26.6465L415.854 32.1465L415.146 32.8536L410 27.7072L404.854 32.8536L404.146 32.1465L409.646 26.6465L410 26.293Z" fill="white"/>
+</g>
+<g id="arrow-down">
+<path id="Union_31" fill-rule="evenodd" clip-rule="evenodd" d="M430 13.7071L430.354 13.3536L435.854 7.85359L435.146 7.14648L430 12.2929L424.854 7.14648L424.146 7.85359L429.646 13.3536L430 13.7071Z" fill="black"/>
+</g>
+<g id="arrow-down_2">
+<path id="Union_32" fill-rule="evenodd" clip-rule="evenodd" d="M430 33.7071L430.354 33.3536L435.854 27.8536L435.146 27.1465L430 32.2929L424.854 27.1465L424.146 27.8536L429.646 33.3536L430 33.7071Z" fill="white"/>
+</g>
 </g>
 </svg>
diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less
index 1d6c7bbf0..5d588ee1d 100644
--- a/apps/common/embed/resources/less/common.less
+++ b/apps/common/embed/resources/less/common.less
@@ -503,7 +503,7 @@
 @icon-height: 20px;
 .svg-icon {
     background: data-uri('../../../../common/embed/resources/img/icon-menu-sprite.svg') no-repeat;
-    background-size: @icon-width*19 @icon-height*2;
+    background-size: @icon-width*22 @icon-height*2;
 
     &.download {
         background-position: -@icon-width 0;
@@ -557,6 +557,18 @@
     &.more-vertical {
         background-position: -@icon-width*14 0;
     }
+    &.search-close {
+        background-position: -@icon-width*18 0;
+    }
+    &.search {
+        background-position: -@icon-width*19 0;
+    }
+    &.search-arrow-up {
+        background-position: -@icon-width*20 0;
+    }
+    &.search-arrow-down {
+        background-position: -@icon-width*21 0;
+    }
 }
 
 .mi-icon {
@@ -785,4 +797,73 @@
             font-weight: normal;
         }
     }
+}
+
+#id-search {
+    button.active {
+        background-color: @btnActiveColor !important;
+        background-position: -@icon-width*19 -@icon-height;
+    }
+}
+
+.search-window {
+    width: 301px;
+    height: 54px;
+    z-index: 50;
+    position: fixed;
+
+    box-shadow: 0 5px 15px rgba(0,0,0,0.2);
+    border-radius: 5px;
+    border: solid 1px #CBCBCB;
+
+    .body {
+        width: 100%;
+        height: 100%;
+        border-radius: 5px;
+        background-color: #FFFFFF;
+        display: flex;
+        padding: 16px;
+
+        input {
+            width: 192px;
+            height: 22px;
+            border-radius: 2px;
+            box-shadow: none;
+            border: solid 1px #CFCFCF;
+            padding: 1px 3px;
+            color: #444444;
+            font-size: 11px;
+
+            &::placeholder {
+                color: #CFCFCF;
+            }
+
+            &:focus {
+                border-color: #848484;
+                outline: 0;
+            }
+        }
+
+        .tools {
+            display: flex;
+
+            button {
+                border: none;
+                margin-left: 7px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                opacity: 0.8;
+
+                &:hover:not(:disabled) {
+                    background-color: #d8dadc;
+                }
+
+                &:disabled {
+                    opacity: 0.4;
+                    cursor: default;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index b4ba894b1..c6b115212 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -198,6 +198,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-left-small margin-right-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
@@ -255,6 +256,8 @@
       <script type="text/javascript" src="../../common/embed/lib/view/LoadMask.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/view/modals.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/controller/modals.js"></script>
+      <script type="text/javascript" src="../../common/embed/lib/view/SearchBar.js"></script>
+      <script type="text/javascript" src="js/SearchBar.js"></script>
       <script type="text/javascript" src="js/ApplicationView.js"></script>
       <script type="text/javascript" src="js/ApplicationController.js"></script>
       <script type="text/javascript" src="js/application.js"></script>
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index c2a007ef8..309d7bd06 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -75,6 +75,8 @@ DE.ApplicationController = new(function(){
         embedConfig = $.extend(embedConfig, data.config.embedded);
 
         common.controller.modals.init(embedConfig);
+        common.controller.SearchBar.init(embedConfig);
+
 
         // Docked toolbar
         if (embedConfig.toolbarDocked === 'bottom') {
@@ -450,6 +452,10 @@ DE.ApplicationController = new(function(){
             embed: '#idt-embed'
         });
 
+        common.controller.SearchBar.attach({
+            search: '#id-search'
+        });
+
         api.asc_registerCallback('asc_onStartAction',           onLongActionBegin);
         api.asc_registerCallback('asc_onEndAction',             onLongActionEnd);
         api.asc_registerCallback('asc_onMouseMoveStart',        onDocMouseMoveStart);
@@ -912,6 +918,8 @@ DE.ApplicationController = new(function(){
             Common.Gateway.on('opendocument',       loadDocument);
             Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.appReady();
+
+            common.controller.SearchBar.setApi(api);
         }
 
         return me;
diff --git a/apps/documenteditor/embed/js/SearchBar.js b/apps/documenteditor/embed/js/SearchBar.js
new file mode 100644
index 000000000..0ac1b28e6
--- /dev/null
+++ b/apps/documenteditor/embed/js/SearchBar.js
@@ -0,0 +1,175 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  SearchBar.js
+ *
+ *  Created by Julia Svinareva on 27.04.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
++function () {
+    !window.common && (window.common = {});
+    !common.controller && (common.controller = {});
+
+    common.controller.SearchBar = new(function() {
+        var $searchBar,
+            $searchBtn,
+            $searchInput,
+            appConfig,
+            api,
+            _state = {
+                searchText: ''
+            },
+            _lastInputChange,
+            _searchTimer;
+
+        var setApi = function (appApi) {
+            api = appApi;
+            if (api) {
+                api.asc_registerCallback('asc_onSetSearchCurrent', onApiUpdateSearchCurrent);
+            }
+        };
+
+        var create = function () {
+            $searchBar = common.view.SearchBar.create();
+            if (appConfig.toolbarDocked === 'bottom') {
+                $searchBar.css({'right': '45px', 'bottom': '31px'});
+            } else {
+                $searchBar.css({'right': '45px', 'top': '31px'});
+            }
+
+            $searchInput = $searchBar.find('#search-bar-text');
+            $searchInput.on('input', function(e){
+                common.view.SearchBar.disableNavButtons();
+                onInputSearchChange($searchInput.val());
+            }).on('keydown', function (e) {
+                onSearchNext('keydown', $searchInput.val(), e);
+            });
+            $searchBar.find('#search-bar-back').on('click', function(e){
+                onSearchNext('back', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-next').on('click', function(e){
+                onSearchNext('next', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-close').on('click', function(e){
+                highlightResults(false);
+                $searchBar.hide();
+                $searchBtn.find('button').button('toggle');
+            });
+
+            common.view.SearchBar.disableNavButtons();
+        };
+
+        var attachToView = function(config) {
+            if ( !$searchBar ) {
+                create();
+            }
+
+            $searchBtn = $(config.search);
+            $searchBtn.on('click', function(e){
+                if ($searchBar.is(':visible')) {
+                    highlightResults(false);
+                    $searchBar.hide();
+                } else {
+                    highlightResults(true);
+                    var text = (api && api.asc_GetSelectedText()) || _state.searchText;
+                    $searchInput.val(text);
+                    (text.length > 0) && onInputSearchChange(text);
+
+                    $searchBar.show();
+                    $searchInput.focus();
+                    $searchInput.select();
+                }
+                $searchBtn.find('button').button('toggle');
+            });
+        };
+
+        var onInputSearchChange = function (text) {
+            if (_state.searchText !== text) {
+                _state.newSearchText = text;
+                _lastInputChange = (new Date());
+                if (_searchTimer === undefined) {
+                    _searchTimer = setInterval(function() {
+                        if ((new Date()) - _lastInputChange < 400) return;
+
+                        _state.searchText = _state.newSearchText;
+                        (_state.newSearchText !== '') && onQuerySearch();
+                        clearInterval(_searchTimer);
+                        _searchTimer = undefined;
+                    }, 10);
+                }
+            }
+        };
+
+        var onQuerySearch = function (d, w) {
+            var searchSettings = new AscCommon.CSearchSettings();
+            searchSettings.put_Text(_state.searchText);
+            searchSettings.put_MatchCase(false);
+            searchSettings.put_WholeWords(false);
+            if (!api.asc_findText(searchSettings, d != 'back')) {
+                common.view.SearchBar.disableNavButtons();
+                return false;
+            }
+            return true;
+        };
+
+        var onSearchNext = function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === 13 || type !== 'keydown')) {
+                _state.searchText = text;
+                if (onQuerySearch(type) && _searchTimer) {
+                    clearInterval(_searchTimer);
+                    _searchTimer = undefined;
+                }
+            }
+        };
+
+        var onApiUpdateSearchCurrent = function (current, all) {
+            common.view.SearchBar.disableNavButtons(current, all);
+        };
+
+        var highlightResults = function (val) {
+            if (_state.isHighlightedResults !== val) {
+                api.asc_selectSearchingResults(val);
+                _state.isHighlightedResults = val;
+            }
+        };
+
+        return {
+            init: function(config) { appConfig = config; },
+            attach: attachToView,
+            setApi: setApi
+        };
+    });
+}();
\ No newline at end of file
diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html
index a8f46bea0..bbe83d6e5 100644
--- a/apps/presentationeditor/embed/index.html
+++ b/apps/presentationeditor/embed/index.html
@@ -250,6 +250,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
@@ -305,6 +306,8 @@
       <script type="text/javascript" src="../../common/embed/lib/view/LoadMask.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/view/modals.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/controller/modals.js"></script>
+      <script type="text/javascript" src="../../common/embed/lib/view/SearchBar.js"></script>
+      <script type="text/javascript" src="js/SearchBar.js"></script>
       <script type="text/javascript" src="js/ApplicationView.js"></script>
       <script type="text/javascript" src="js/ApplicationController.js"></script>
       <script type="text/javascript" src="js/application.js"></script>
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index d451768e3..74d4e5ec4 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -72,6 +72,7 @@ PE.ApplicationController = new(function(){
         embedConfig = $.extend(embedConfig, data.config.embedded);
 
         common.controller.modals.init(embedConfig);
+        common.controller.SearchBar.init(embedConfig);
 
         // Docked toolbar
         if (embedConfig.toolbarDocked === 'bottom') {
@@ -293,6 +294,10 @@ PE.ApplicationController = new(function(){
             embed: '#idt-embed'
         });
 
+        common.controller.SearchBar.attach({
+            search: '#id-search'
+        });
+
         api.asc_registerCallback('asc_onMouseMoveStart',        onDocMouseMoveStart);
         api.asc_registerCallback('asc_onMouseMoveEnd',          onDocMouseMoveEnd);
         api.asc_registerCallback('asc_onMouseMove',             onDocMouseMove);
@@ -720,6 +725,8 @@ PE.ApplicationController = new(function(){
             Common.Gateway.on('opendocument',       loadDocument);
             Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.appReady();
+
+            common.controller.SearchBar.setApi(api);
         }
 
         return me;
diff --git a/apps/presentationeditor/embed/js/SearchBar.js b/apps/presentationeditor/embed/js/SearchBar.js
new file mode 100644
index 000000000..ab3f3905a
--- /dev/null
+++ b/apps/presentationeditor/embed/js/SearchBar.js
@@ -0,0 +1,165 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  SearchBar.js
+ *
+ *  Created by Julia Svinareva on 27.04.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
++function () {
+    !window.common && (window.common = {});
+    !common.controller && (common.controller = {});
+
+    common.controller.SearchBar = new(function() {
+        var $searchBar,
+            $searchBtn,
+            $searchInput,
+            appConfig,
+            api,
+            _state = {
+                searchText: ''
+            },
+            _lastInputChange,
+            _searchTimer;
+
+        var setApi = function (appApi) {
+            api = appApi;
+            if (api) {
+                api.asc_registerCallback('asc_onSetSearchCurrent', onApiUpdateSearchCurrent);
+            }
+        };
+
+        var create = function () {
+            $searchBar = common.view.SearchBar.create();
+            if (appConfig.toolbarDocked === 'bottom') {
+                $searchBar.css({'right': '45px', 'bottom': '31px'});
+            } else {
+                $searchBar.css({'right': '45px', 'top': '31px'});
+            }
+
+            $searchInput = $searchBar.find('#search-bar-text');
+            $searchInput.on('input', function(e){
+                common.view.SearchBar.disableNavButtons();
+                onInputSearchChange($searchInput.val());
+            }).on('keydown', function (e) {
+                onSearchNext('keydown', $searchInput.val(), e);
+            });
+            $searchBar.find('#search-bar-back').on('click', function(e){
+                onSearchNext('back', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-next').on('click', function(e){
+                onSearchNext('next', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-close').on('click', function(e){
+                $searchBar.hide();
+                $searchBtn.find('button').button('toggle');
+            });
+
+            common.view.SearchBar.disableNavButtons();
+        };
+
+        var attachToView = function(config) {
+            if ( !$searchBar ) {
+                create();
+            }
+
+            $searchBtn = $(config.search);
+            $searchBtn.on('click', function(e){
+                if ($searchBar.is(':visible')) {
+                    $searchBar.hide();
+                } else {
+                    var text = (api && api.asc_GetSelectedText()) || _state.searchText;
+                    $searchInput.val(text);
+                    (text.length > 0) && onInputSearchChange(text);
+
+                    $searchBar.show();
+                    $searchInput.focus();
+                    $searchInput.select();
+                }
+                $searchBtn.find('button').button('toggle');
+            });
+        };
+
+        var onInputSearchChange = function (text) {
+            if (_state.searchText !== text) {
+                _state.newSearchText = text;
+                _lastInputChange = (new Date());
+                if (_searchTimer === undefined) {
+                    _searchTimer = setInterval(function() {
+                        if ((new Date()) - _lastInputChange < 400) return;
+
+                        _state.searchText = _state.newSearchText;
+                        (_state.newSearchText !== '') && onQuerySearch();
+                        clearInterval(_searchTimer);
+                        _searchTimer = undefined;
+                    }, 10);
+                }
+            }
+        };
+
+        var onQuerySearch = function (d, w) {
+            var searchSettings = new AscCommon.CSearchSettings();
+            searchSettings.put_Text(_state.searchText);
+            searchSettings.put_MatchCase(false);
+            searchSettings.put_WholeWords(false);
+            if (!api.asc_findText(searchSettings, d != 'back')) {
+                common.view.SearchBar.disableNavButtons();
+                return false;
+            }
+            return true;
+        };
+
+        var onSearchNext = function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === 13 || type !== 'keydown')) {
+                _state.searchText = text;
+                if (onQuerySearch(type) && _searchTimer) {
+                    clearInterval(_searchTimer);
+                    _searchTimer = undefined;
+                }
+            }
+        };
+
+        var onApiUpdateSearchCurrent = function (current, all) {
+            common.view.SearchBar.disableNavButtons(current, all);
+        };
+
+        return {
+            init: function(config) { appConfig = config; },
+            attach: attachToView,
+            setApi: setApi
+        };
+    });
+}();
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html
index 94cf225af..f626036aa 100644
--- a/apps/spreadsheeteditor/embed/index.html
+++ b/apps/spreadsheeteditor/embed/index.html
@@ -224,6 +224,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>
@@ -281,6 +282,8 @@
       <script type="text/javascript" src="../../common/embed/lib/view/LoadMask.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/view/modals.js"></script>
       <script type="text/javascript" src="../../common/embed/lib/controller/modals.js"></script>
+      <script type="text/javascript" src="../../common/embed/lib/view/SearchBar.js"></script>
+      <script type="text/javascript" src="js/SearchBar.js"></script>
       <script type="text/javascript" src="js/ApplicationView.js"></script>
       <script type="text/javascript" src="js/ApplicationController.js"></script>
       <script type="text/javascript" src="js/application.js"></script>
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 5e0d7bcf4..aaebbc0f5 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -74,6 +74,7 @@ SSE.ApplicationController = new(function(){
         embedConfig = $.extend(embedConfig, data.config.embedded);
 
         common.controller.modals.init(embedConfig);
+        common.controller.SearchBar.init(embedConfig);
 
         // Docked toolbar
         if (embedConfig.toolbarDocked === 'bottom') {
@@ -232,6 +233,10 @@ SSE.ApplicationController = new(function(){
             embed: '#idt-embed'
         });
 
+        common.controller.SearchBar.attach({
+            search: '#id-search'
+        });
+
         api.asc_registerCallback('asc_onMouseMove',             onApiMouseMove);
         api.asc_registerCallback('asc_onHyperlinkClick',        common.utils.openLink);
         api.asc_registerCallback('asc_onDownloadUrl',           onDownloadUrl);
@@ -666,6 +671,8 @@ SSE.ApplicationController = new(function(){
             Common.Gateway.on('opendocument',       loadDocument);
             Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.appReady();
+
+            common.controller.SearchBar.setApi(api);
         }
 
         return me;
diff --git a/apps/spreadsheeteditor/embed/js/SearchBar.js b/apps/spreadsheeteditor/embed/js/SearchBar.js
new file mode 100644
index 000000000..dfc5fe20b
--- /dev/null
+++ b/apps/spreadsheeteditor/embed/js/SearchBar.js
@@ -0,0 +1,179 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2020
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  SearchBar.js
+ *
+ *  Created by Julia Svinareva on 27.04.2022
+ *  Copyright (c) 2022 Ascensio System SIA. All rights reserved.
+ *
+ */
+
++function () {
+    !window.common && (window.common = {});
+    !common.controller && (common.controller = {});
+
+    common.controller.SearchBar = new(function() {
+        var $searchBar,
+            $searchBtn,
+            $searchInput,
+            appConfig,
+            api,
+            _state = {
+                searchText: ''
+            },
+            _lastInputChange,
+            _searchTimer;
+
+        var setApi = function (appApi) {
+            api = appApi;
+            if (api) {
+                api.asc_registerCallback('asc_onSetSearchCurrent', onApiUpdateSearchCurrent);
+            }
+        };
+
+        var create = function () {
+            $searchBar = common.view.SearchBar.create();
+            if (appConfig.toolbarDocked === 'bottom') {
+                $searchBar.css({'right': '45px', 'bottom': '31px'});
+            } else {
+                $searchBar.css({'right': '45px', 'top': '31px'});
+            }
+
+            $searchInput = $searchBar.find('#search-bar-text');
+            $searchInput.on('input', function(e){
+                common.view.SearchBar.disableNavButtons();
+                onInputSearchChange($searchInput.val());
+            }).on('keydown', function (e) {
+                onSearchNext('keydown', $searchInput.val(), e);
+            });
+            $searchBar.find('#search-bar-back').on('click', function(e){
+                onSearchNext('back', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-next').on('click', function(e){
+                onSearchNext('next', $searchInput.val());
+            });
+            $searchBar.find('#search-bar-close').on('click', function(e){
+                highlightResults(false);
+                $searchBar.hide();
+                $searchBtn.find('button').button('toggle');
+            });
+
+            common.view.SearchBar.disableNavButtons();
+        };
+
+        var attachToView = function(config) {
+            if ( !$searchBar ) {
+                create();
+            }
+
+            $searchBtn = $(config.search);
+            $searchBtn.on('click', function(e){
+                if ($searchBar.is(':visible')) {
+                    highlightResults(false);
+                    $searchBar.hide();
+                } else {
+                    highlightResults(true);
+                    var text = (api && api.asc_GetSelectedText()) || _state.searchText;
+                    $searchInput.val(text);
+                    (text.length > 0) && onInputSearchChange(text);
+
+                    $searchBar.show();
+                    $searchInput.focus();
+                    $searchInput.select();
+                }
+                $searchBtn.find('button').button('toggle');
+            });
+        };
+
+        var onInputSearchChange = function (text) {
+            if (_state.searchText !== text) {
+                _state.newSearchText = text;
+                _lastInputChange = (new Date());
+                if (_searchTimer === undefined) {
+                    _searchTimer = setInterval(function() {
+                        if ((new Date()) - _lastInputChange < 400) return;
+
+                        _state.searchText = _state.newSearchText;
+                        (_state.newSearchText !== '') && onQuerySearch();
+                        clearInterval(_searchTimer);
+                        _searchTimer = undefined;
+                    }, 10);
+                }
+            }
+        };
+
+        var onQuerySearch = function (d, w) {
+            var options = new Asc.asc_CFindOptions();
+            options.asc_setFindWhat(_state.searchText);
+            options.asc_setScanForward(d != 'back');
+            options.asc_setIsMatchCase(false);
+            options.asc_setIsWholeCell(false);
+            options.asc_setScanOnOnlySheet(Asc.c_oAscSearchBy.Sheet);
+            options.asc_setScanByRows(true);
+            options.asc_setLookIn(Asc.c_oAscFindLookIn.Formulas);
+            if (!api.asc_findText(options)) {
+                common.view.SearchBar.disableNavButtons();
+                return false;
+            }
+            return true;
+        };
+
+        var onSearchNext = function (type, text, e) {
+            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === 13 || type !== 'keydown')) {
+                _state.searchText = text;
+                if (onQuerySearch(type) && _searchTimer) {
+                    clearInterval(_searchTimer);
+                    _searchTimer = undefined;
+                }
+            }
+        };
+
+        var onApiUpdateSearchCurrent = function (current, all) {
+            common.view.SearchBar.disableNavButtons(current, all);
+        };
+
+        var highlightResults = function (val) {
+            if (_state.isHighlightedResults !== val) {
+                api.asc_selectSearchingResults(val);
+                _state.isHighlightedResults = val;
+            }
+        };
+
+        return {
+            init: function(config) { appConfig = config; },
+            attach: attachToView,
+            setApi: setApi
+        };
+    });
+}();
\ No newline at end of file

From f5bfbf4e0742b8ea01796a17ed472254ec36dae6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 28 Apr 2022 12:18:40 +0300
Subject: [PATCH 43/52] Fix opening

---
 apps/documenteditor/main/app/controller/Main.js     | 2 +-
 apps/presentationeditor/main/app/controller/Main.js | 2 +-
 apps/spreadsheeteditor/main/app/controller/Main.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 898603a00..e1b45c1c0 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1500,7 +1500,7 @@ define([
                     Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this));
                     Common.NotificationCenter.on('comments:showdummy', _.bind(this.onShowDummyComment, this));
 
-                this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
+                this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
 
                 this.loadCoAuthSettings();
                 this.applyModeCommonElements();
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 72428694d..99f8798c6 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1165,7 +1165,7 @@ define([
                 this.appOptions.canBrandingExt && this.editorConfig.customization && Common.UI.LayoutManager.init(this.editorConfig.customization.layout);
                 this.appOptions.canBrandingExt && this.editorConfig.customization && Common.UI.FeaturesManager.init(this.editorConfig.customization.features);
 
-                this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
+                this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
 
                 this.loadCoAuthSettings();
                 this.applyModeCommonElements();
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 15e20d05f..e6d6d90d6 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1263,7 +1263,7 @@ define([
                 this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && this.appOptions.canComments;
 
                 this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && this.appOptions.canCoAuthoring &&
-                                                        !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
+                                                        !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false);
 
                 if (!this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge) {
                     this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins);

From aa91f6263c9be65c399d0c02f5070087c96c6c41 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Thu, 28 Apr 2022 17:17:06 +0300
Subject: [PATCH 44/52] [embed] Add translations for search bar, fix deploy
 template

---
 apps/documenteditor/embed/index.html.deploy     | 1 +
 apps/documenteditor/embed/locale/en.json        | 1 +
 apps/presentationeditor/embed/index.html.deploy | 1 +
 apps/presentationeditor/embed/locale/en.json    | 1 +
 apps/spreadsheeteditor/embed/index.html.deploy  | 1 +
 apps/spreadsheeteditor/embed/locale/en.json     | 1 +
 6 files changed, 6 insertions(+)

diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy
index 0bc36adf3..0bf2894db 100644
--- a/apps/documenteditor/embed/index.html.deploy
+++ b/apps/documenteditor/embed/index.html.deploy
@@ -190,6 +190,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small margin-left-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json
index 81b268346..c84f6fd9f 100644
--- a/apps/documenteditor/embed/locale/en.json
+++ b/apps/documenteditor/embed/locale/en.json
@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Height",
   "common.view.modals.txtShare": "Share Link",
   "common.view.modals.txtWidth": "Width",
+  "common.view.SearchBar.textFind": "Find",
   "DE.ApplicationController.convertationErrorText": "Conversion failed.",
   "DE.ApplicationController.convertationTimeoutText": "Conversion timeout exceeded.",
   "DE.ApplicationController.criticalErrorTitle": "Error",
diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy
index 9bc17c3b2..e49a8a143 100644
--- a/apps/presentationeditor/embed/index.html.deploy
+++ b/apps/presentationeditor/embed/index.html.deploy
@@ -244,6 +244,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json
index e9a710980..d311f798c 100644
--- a/apps/presentationeditor/embed/locale/en.json
+++ b/apps/presentationeditor/embed/locale/en.json
@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Height",
   "common.view.modals.txtShare": "Share Link",
   "common.view.modals.txtWidth": "Width",
+  "common.view.SearchBar.textFind": "Find",
   "PE.ApplicationController.convertationErrorText": "Conversion failed.",
   "PE.ApplicationController.convertationTimeoutText": "Conversion timeout exceeded.",
   "PE.ApplicationController.criticalErrorTitle": "Error",
diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy
index eb9dbabea..10f517490 100644
--- a/apps/spreadsheeteditor/embed/index.html.deploy
+++ b/apps/spreadsheeteditor/embed/index.html.deploy
@@ -216,6 +216,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
+              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>
diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json
index 3f9d3aae7..f8c5368b1 100644
--- a/apps/spreadsheeteditor/embed/locale/en.json
+++ b/apps/spreadsheeteditor/embed/locale/en.json
@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Height",
   "common.view.modals.txtShare": "Share Link",
   "common.view.modals.txtWidth": "Width",
+  "common.view.SearchBar.textFind": "Find",
   "SSE.ApplicationController.convertationErrorText": "Conversion failed.",
   "SSE.ApplicationController.convertationTimeoutText": "Conversion timeout exceeded.",
   "SSE.ApplicationController.criticalErrorTitle": "Error",

From f1744a3737cbf1ff2ccc13e9133facbe2c6ff147 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 29 Apr 2022 16:07:59 +0300
Subject: [PATCH 45/52] [DE PE SSE] Fix search

---
 apps/common/main/lib/view/SearchBar.js        |  2 +-
 .../main/app/controller/Search.js             | 22 +++++++++-------
 .../main/app/controller/Search.js             | 22 +++++++++-------
 .../main/app/controller/Search.js             | 26 +++++++++----------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index e14ee235b..55b91e303 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -165,7 +165,7 @@ define([
 
         onLayoutChanged: function () {
             var top = $('#app-title').height() + $('#toolbar').height() + 2,
-                left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32;
+                left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
             this.$window.css({left: left, top: top});
         },
 
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 37ec57ebf..73c936b06 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -208,12 +208,7 @@ define([
                 searchSettings.put_MatchCase(this._state.matchCase);
                 searchSettings.put_WholeWords(this._state.matchWord);
                 if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
-                    this.resultItems = [];
-                    this.view.updateResultsNumber(undefined, 0);
-                    this.view.disableReplaceButtons(true);
-                    this._state.currentResult = 0;
-                    this._state.resultsNumber = 0;
-                    this.view.disableNavButtons();
+                    this.allResultsWasRemoved();
                 }
             }
         },
@@ -240,11 +235,20 @@ define([
                 searchSettings.put_WholeWords(this._state.matchWord);
                 this.api.asc_replaceText(searchSettings, textReplace, true);
 
-                this.hideResults();
-                this.resultItems = [];
+                this.allResultsWasRemoved();
             }
         },
 
+        allResultsWasRemoved: function () {
+            this.resultItems = [];
+            this.hideResults();
+            this.view.updateResultsNumber(undefined, 0);
+            this.view.disableReplaceButtons(true);
+            this._state.currentResult = 0;
+            this._state.resultsNumber = 0;
+            this.view.disableNavButtons();
+        },
+
         onUpdateSearchCurrent: function (current, all) {
             if (current === -1) return;
             this._state.currentResult = current;
@@ -252,7 +256,7 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
                 this.view.disableNavButtons(current, all);
-                if (this.resultItems.length > 0) {
+                if (this.resultItems && this.resultItems.length > 0) {
                     this.resultItems.forEach(function (item) {
                         item.selected = false;
                     });
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 82efb20ef..6f06a098d 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -191,12 +191,7 @@ define([
                 searchSettings.put_MatchCase(this._state.matchCase);
                 searchSettings.put_WholeWords(this._state.matchWord);
                 if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
-                    this.resultItems = [];
-                    this.view.updateResultsNumber(undefined, 0);
-                    this.view.disableReplaceButtons(true);
-                    this._state.currentResult = 0;
-                    this._state.resultsNumber = 0;
-                    this.view.disableNavButtons();
+                    this.allResultsWasRemoved();
                 }
             }
         },
@@ -209,11 +204,20 @@ define([
                 searchSettings.put_WholeWords(this._state.matchWord);
                 this.api.asc_replaceText(searchSettings, textReplace, true);
 
-                this.hideResults();
-                this.resultItems = [];
+                this.allResultsWasRemoved();
             }
         },
 
+        allResultsWasRemoved: function () {
+            this.resultItems = [];
+            this.hideResults();
+            this.view.updateResultsNumber(undefined, 0);
+            this.view.disableReplaceButtons(true);
+            this._state.currentResult = 0;
+            this._state.resultsNumber = 0;
+            this.view.disableNavButtons();
+        },
+
         onUpdateSearchCurrent: function (current, all) {
             if (current === -1) return;
             this._state.currentResult = current;
@@ -221,7 +225,7 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
                 this.view.disableNavButtons(current, all);
-                if (this.resultItems.length > 0) {
+                if (this.resultItems && this.resultItems.length > 0) {
                     this.resultItems.forEach(function (item) {
                         item.selected = false;
                     });
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index c444fab34..869993ac7 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -311,12 +311,7 @@ define([
             var me = this;
             if (this.api.isReplaceAll) {
                 if (!found) {
-                    this.resultItems = [];
-                    this.view.updateResultsNumber(undefined, 0);
-                    this.view.disableReplaceButtons(true);
-                    this._state.currentResult = 0;
-                    this._state.resultsNumber = 0;
-                    this.view.disableNavButtons();
+                    this.allResultsWasRemoved();
                 } else {
                     Common.UI.info({
                         msg: !found-replaced ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced),
@@ -338,16 +333,21 @@ define([
                 options.asc_setScanByRows(this._state.searchByRows);
                 options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value);
                 if (!this.api.asc_findText(options)) {
-                    this.resultItems = [];
-                    this.view.updateResultsNumber(undefined, 0);
-                    this.view.disableReplaceButtons(true);
-                    this._state.currentResult = 0;
-                    this._state.resultsNumber = 0;
-                    this.view.disableNavButtons();
+                    this.allResultsWasRemoved();
                 }
             }
         },
 
+        allResultsWasRemoved: function () {
+            this.resultItems = [];
+            this.hideResults();
+            this.view.updateResultsNumber(undefined, 0);
+            this.view.disableReplaceButtons(true);
+            this._state.currentResult = 0;
+            this._state.resultsNumber = 0;
+            this.view.disableNavButtons();
+        },
+
         onApiRemoveTextAroundSearch: function (arr) {
             var me = this;
             arr.forEach(function (id) {
@@ -366,7 +366,7 @@ define([
             if (this.view) {
                 this.view.updateResultsNumber(current, all);
                 this.view.disableNavButtons(current, all);
-                if (this.resultItems.length > 0) {
+                if (this.resultItems && this.resultItems.length > 0) {
                     this.resultItems.forEach(function (item) {
                         item.selected = false;
                     });

From 748ea8a7a1bcf2f6d4a16062fced890fd6f1ac7b Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 3 May 2022 23:45:37 +0300
Subject: [PATCH 46/52] [embed] add searchbar to build script

---
 build/documenteditor.json     | 2 ++
 build/presentationeditor.json | 2 ++
 build/spreadsheeteditor.json  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/build/documenteditor.json b/build/documenteditor.json
index 581ba44c9..76b63b587 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -334,6 +334,8 @@
                 "../apps/common/embed/lib/view/LoadMask.js",
                 "../apps/common/embed/lib/view/modals.js",
                 "../apps/common/embed/lib/controller/modals.js",
+                "../apps/common/embed/lib/view/SearchBar.js",
+                "../apps/documenteditor/embed/js/SearchBar.js",
                 "../apps/documenteditor/embed/js/ApplicationView.js",
                 "../apps/documenteditor/embed/js/ApplicationController.js",
                 "../apps/documenteditor/embed/js/application.js"
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index 4d2ebeee0..0d8cf19ad 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -338,6 +338,8 @@
                 "../apps/common/embed/lib/view/LoadMask.js",
                 "../apps/common/embed/lib/view/modals.js",
                 "../apps/common/embed/lib/controller/modals.js",
+                "../apps/common/embed/lib/view/SearchBar.js",
+                "../apps/presentationeditor/embed/js/SearchBar.js",
                 "../apps/presentationeditor/embed/js/ApplicationView.js",
                 "../apps/presentationeditor/embed/js/ApplicationController.js",
                 "../apps/presentationeditor/embed/js/application.js"
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index c0b8bddb8..3bb80c57b 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -351,6 +351,8 @@
                 "../apps/common/embed/lib/view/LoadMask.js",
                 "../apps/common/embed/lib/view/modals.js",
                 "../apps/common/embed/lib/controller/modals.js",
+                "../apps/common/embed/lib/view/SearchBar.js",
+                "../apps/spreadsheeteditor/embed/js/SearchBar.js",
                 "../apps/spreadsheeteditor/embed/js/ApplicationView.js",
                 "../apps/spreadsheeteditor/embed/js/ApplicationController.js",
                 "../apps/spreadsheeteditor/embed/js/application.js"

From 1e0e6b95d3a70a4812f2f9bd2fd34dde566207d6 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 13 May 2022 20:53:11 +0300
Subject: [PATCH 47/52] [SSE] Fix search

---
 apps/spreadsheeteditor/main/resources/less/leftmenu.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
index 96e8514ee..29f637b46 100644
--- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -703,6 +703,9 @@
                     padding-left: 4px;
                     height: 28px;
                     line-height: 28px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
                     &:last-child {
                         width: 36%;
                     }

From 614a9fa1cc5d8bf6fc314e7e9c71b77e5367fb85 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 16 May 2022 19:30:18 +0300
Subject: [PATCH 48/52] [SSE] Add tooltips in search results

---
 .../main/app/controller/Search.js             | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 869993ac7..f0465d066 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -420,27 +420,47 @@ define([
                 data.forEach(function (item, ind) {
                     var isSelected = ind === me._state.currentResult;
                     var tr = '<div class="item" style="width: 100%;">' +
-                        '<div>' + item[1] + '</div>' +
-                        '<div>' + item[2] + '</div>' +
-                        '<div>' + item[3] + '</div>' +
-                        '<div>' + item[4] + '</div>' +
-                        '<div>' + item[5] + '</div>' +
+                        '<div class="sheet">' + (item[1] ? item[1] : '') + '</div>' +
+                        '<div class="name">' + (item[2] ? item[2] : '') + '</div>' +
+                        '<div class="cell">' + (item[3] ? item[3] : '') + '</div>' +
+                        '<div class="value">' + (item[4] ? item[4] : '') + '</div>' +
+                        '<div class="formula">' + (item[5] ? item[5] : '') + '</div>' +
                         '</div>';
                     var $item = $(tr).appendTo($innerResults);
                     if (isSelected) {
                         $item.addClass('selected');
                     }
-                    var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected};
+                    var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected, data: data};
                     me.resultItems.push(resultItem);
                     $item.on('click', _.bind(function (el) {
                         var id = item[0];
                         me.api.asc_SelectSearchElement(id);
                     }, me));
+                    me.addTooltips($item, item);
                 });
                 this.view.$resultsContainer.show();
             }
         },
 
+        addTooltips: function (item, data) {
+            var cells = [item.find('.sheet'), item.find('.name'), item.find('.cell'), item.find('.value'), item.find('.formula')],
+                tips = [data[1], data[2], data[3], data[4], data[5]];
+            cells.forEach(function (el, ind) {
+                var tip = tips[ind];
+                if (tip) {
+                    el.one('mouseenter', function () {
+                        el.attr('data-toggle', 'tooltip');
+                        el.tooltip({
+                            title: tip,
+                            placement: 'cursor',
+                            zIndex: 1000
+                        });
+                        el.mouseenter();
+                    });
+                }
+            });
+        },
+
         hideResults: function () {
             if (this.view) {
                 this.view.$resultsContainer.hide();
@@ -496,6 +516,7 @@ define([
                         $('#search-results').find('.item').removeClass('selected');
                         $(el.currentTarget).addClass('selected');
                     });
+                    me.addTooltips($item, item.data);
                 });
                 this.scrollToSelectedResult();
             }

From b68c5a7f0c0f75b3a5eb37bd204694a6133dd74e Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 20 May 2022 14:03:21 +0300
Subject: [PATCH 49/52] [DE PE SSE] Fix search panel after show

---
 apps/documenteditor/main/app/controller/Search.js     |  7 ++++---
 apps/presentationeditor/main/app/controller/Search.js |  7 ++++---
 .../spreadsheeteditor/main/app/controller/LeftMenu.js |  4 ++--
 apps/spreadsheeteditor/main/app/controller/Search.js  | 11 ++++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 73c936b06..e23c9a700 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -303,7 +303,7 @@ define([
 
         onApiGetTextAroundSearch: function (data) {
             if (this.view && this._state.isStartedAddingResults) {
-                if (data.length > 300) return;
+                if (data.length > 300 || !data.length) return;
                 var me = this;
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
@@ -352,7 +352,7 @@ define([
                 viewport.searchBar.hide();
             }
 
-            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
             if (this.resultItems && this.resultItems.length > 0 &&
                 (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
                     this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
@@ -360,8 +360,9 @@ define([
             }
             if (text) {
                 this.view.setFindText(text);
-            } else if (text !== undefined) {
+            } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
                 this.view.setFindText('');
+                this._state.searchText = undefined;
             }
 
             this.hideResults();
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 6f06a098d..2d0db8205 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -272,7 +272,7 @@ define([
 
         onApiGetTextAroundSearch: function (data) {
             if (this.view && this._state.isStartedAddingResults) {
-                if (data.length > 300) return;
+                if (data.length > 300 || !data.length) return;
                 var me = this;
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
@@ -321,11 +321,12 @@ define([
                 viewport.searchBar.hide();
             }
 
-            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
             if (text) {
                 this.view.setFindText(text);
-            } else if (text !== undefined) {
+            } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
                 this.view.setFindText('');
+                this._state.searchText = undefined;
             }
 
             this.hideResults();
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 723ca475d..1d07b9d61 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -683,7 +683,7 @@ define([
                         if (this.isSearchPanelVisible()) {
                             selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
                             this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
-                            this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText);
+                            this.leftMenu.fireEvent('search:aftershow', [selectedText]);
                             return false;
                         } else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
                             var viewport = this.getApplication().getController('Viewport');
@@ -840,7 +840,7 @@ define([
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
                 this.leftMenu.showMenu('advancedsearch');
-                this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
+                this.leftMenu.fireEvent('search:aftershow', [findText]);
             } else {
                 this.leftMenu.btnSearchBar.toggle(false, true);
                 this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index f0465d066..36ddf3c6f 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -413,7 +413,7 @@ define([
 
         onApiGetTextAroundSearch: function (data) { // [id, sheet, name, cell, value, formula]
             if (this.view && this._state.isStartedAddingResults) {
-                if (data.length > 300) return;
+                if (data.length > 300 || !data.length) return;
                 var me = this,
                     $innerResults = me.view.$resultsContainer.find('.search-items');
                 me.resultItems = [];
@@ -474,20 +474,21 @@ define([
                 viewport.searchBar.hide();
             }
 
-            var text = findText || this.api.asc_GetSelectedText() || this._state.searchText;
+            var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
             if (this.resultItems && this.resultItems.length > 0 &&
                 (!this._state.matchCase && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
                     this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
                 return;
             }
-            if (text && text !== this.view.inputText.getValue()) {
+            if (text) {
                 this.view.setFindText(text);
-            } else if (text !== undefined) {
+            } else if (text !== undefined) { // panel was opened from empty searchbar, clear to start new search
                 this.view.setFindText('');
+                this._state.searchText = undefined;
             }
 
             this.hideResults();
-            if (text !== '') { // search was made
+            if (text !== '' && text === this._state.searchText) { // search was made
                 this.view.disableReplaceButtons(false);
                 this.api.asc_StartTextAroundSearch();
             } else if (text !== '') { // search wasn't made

From 7a8469925e089cbd4d1a98137b6f08c601143853 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 24 May 2022 12:46:59 +0300
Subject: [PATCH 50/52] [DE PE SSE] Fix search restarting

---
 .../main/app/controller/Search.js             | 23 ++++++++++++-------
 .../main/app/controller/Search.js             | 23 ++++++++++++-------
 .../main/app/controller/Search.js             | 21 ++++++++++-------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index e23c9a700..bee8c9b64 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -121,21 +121,28 @@ define([
                     this._state.useRegExp = checked;
                     break;
             }
-            if (this._state.searchText !== '' && this.onQuerySearch()) {
+            if (this._state.searchText !== '') {
                 this.hideResults();
-                clearInterval(this.searchTimer);
-                this.searchTimer = undefined;
-                this.api.asc_StartTextAroundSearch();
+                if (this.onQuerySearch()) {
+                    if (this.searchTimer) {
+                        clearInterval(this.searchTimer);
+                        this.searchTimer = undefined;
+                    }
+                    this.api.asc_StartTextAroundSearch();
+                }
             }
         },
 
         onSearchNext: function (type, text, e) {
-            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+            var isReturnKey = type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN;
+            if (text && text.length > 0 && (isReturnKey || type !== 'keydown')) {
                 this._state.searchText = text;
-                if (this.onQuerySearch(type) && this.searchTimer) {
+                if (this.onQuerySearch(type) && (this.searchTimer || isReturnKey)) {
                     this.hideResults();
-                    clearInterval(this.searchTimer);
-                    this.searchTimer = undefined;
+                    if (this.searchTimer) {
+                        clearInterval(this.searchTimer);
+                        this.searchTimer = undefined;
+                    }
                     if (this.view.$el.is(':visible')) {
                         this.api.asc_StartTextAroundSearch();
                     }
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 2d0db8205..dc540f244 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -118,21 +118,28 @@ define([
                     this._state.useRegExp = checked;
                     break;
             }
-            if (this._state.searchText !== '' && this.onQuerySearch()) {
+            if (this._state.searchText !== '') {
                 this.hideResults();
-                clearInterval(this.searchTimer);
-                this.searchTimer = undefined;
-                this.api.asc_StartTextAroundSearch();
+                if (this.onQuerySearch()) {
+                    if (this.searchTimer) {
+                        clearInterval(this.searchTimer);
+                        this.searchTimer = undefined;
+                    }
+                    this.api.asc_StartTextAroundSearch();
+                }
             }
         },
 
         onSearchNext: function (type, text, e) {
-            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+            var isReturnKey = type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN;
+            if (text && text.length > 0 && (isReturnKey || type !== 'keydown')) {
                 this._state.searchText = text;
-                if (this.onQuerySearch(type) && this.searchTimer) {
+                if (this.onQuerySearch(type) && (this.searchTimer || isReturnKey)) {
                     this.hideResults();
-                    clearInterval(this.searchTimer);
-                    this.searchTimer = undefined;
+                    if (this.searchTimer) {
+                        clearInterval(this.searchTimer);
+                        this.searchTimer = undefined;
+                    }
                     if (this.view.$el.is(':visible')) {
                         this.api.asc_StartTextAroundSearch();
                     }
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 36ddf3c6f..1ee6a487a 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -157,11 +157,13 @@ define([
                     this._state.lookInFormulas = value;
                     break;
             }
-            if (runSearch && this._state.searchText !== '' && this.onQuerySearch()) {
+            if (runSearch && this._state.searchText !== '') {
                 this.hideResults();
-                clearInterval(this.searchTimer);
-                this.searchTimer = undefined;
-                this.api.asc_StartTextAroundSearch();
+                if (this.onQuerySearch()) {
+                    this.searchTimer && clearInterval(this.searchTimer);
+                    this.searchTimer = undefined;
+                    this.api.asc_StartTextAroundSearch();
+                }
             }
         },
 
@@ -192,12 +194,15 @@ define([
         },
 
         onSearchNext: function (type, text, e) {
-            if (text && text.length > 0 && (type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN || type !== 'keydown')) {
+            var isReturnKey = type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN;
+            if (text && text.length > 0 && (isReturnKey || type !== 'keydown')) {
                 this._state.searchText = text;
-                if (this.onQuerySearch(type) && this.searchTimer) {
+                if (this.onQuerySearch(type) && (this.searchTimer || isReturnKey)) {
                     this.hideResults();
-                    clearInterval(this.searchTimer);
-                    this.searchTimer = undefined;
+                    if (this.searchTimer) {
+                        clearInterval(this.searchTimer);
+                        this.searchTimer = undefined;
+                    }
                     if (this.view.$el.is(':visible')) {
                         this.api.asc_StartTextAroundSearch();
                     }

From 1ea8e4c455a0ab0b33f8e0aea187c66d016f7be8 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 24 May 2022 13:02:06 +0300
Subject: [PATCH 51/52] [SSE] Fix results hiding after replace all

---
 apps/spreadsheeteditor/main/app/controller/Search.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 1ee6a487a..76192db40 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -318,8 +318,9 @@ define([
                 if (!found) {
                     this.allResultsWasRemoved();
                 } else {
+                    !(found-replaced) && this.allResultsWasRemoved();
                     Common.UI.info({
-                        msg: !found-replaced ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced),
+                        msg: !(found-replaced) ? Common.Utils.String.format(this.textReplaceSuccess,replaced) : Common.Utils.String.format(this.textReplaceSkipped,found-replaced),
                         callback: function() {
                             me.view.focus();
                         }

From 78386d2d7114277fefb9a9f711e3430ae77ef579 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 25 May 2022 11:48:57 +0300
Subject: [PATCH 52/52] [PE embed] Hide search

---
 apps/presentationeditor/embed/index.html        | 2 +-
 apps/presentationeditor/embed/index.html.deploy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html
index bbe83d6e5..f3e521f93 100644
--- a/apps/presentationeditor/embed/index.html
+++ b/apps/presentationeditor/embed/index.html
@@ -250,7 +250,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
+              <!--<div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>-->
               <div class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy
index e49a8a143..94070e1fe 100644
--- a/apps/presentationeditor/embed/index.html.deploy
+++ b/apps/presentationeditor/embed/index.html.deploy
@@ -244,7 +244,7 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>
+              <!--<div id="id-search" style="display: inline-block;"><button class="control-btn svg-icon search"></button></div>-->
               <div class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>