From 09d1f9d1a3fb88bdb4af27c6e9615016a24f985f Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 12 Sep 2022 14:26:27 +0300
Subject: [PATCH] [DE PE embed] Fix bug 58292

---
 apps/documenteditor/embed/js/SearchBar.js             | 6 +++++-
 apps/documenteditor/main/app/controller/Search.js     | 2 ++
 apps/presentationeditor/embed/js/SearchBar.js         | 6 +++++-
 apps/presentationeditor/main/app/controller/Search.js | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/embed/js/SearchBar.js b/apps/documenteditor/embed/js/SearchBar.js
index a9e980d51..6b69b0eff 100644
--- a/apps/documenteditor/embed/js/SearchBar.js
+++ b/apps/documenteditor/embed/js/SearchBar.js
@@ -117,7 +117,11 @@
                         if ((new Date()) - _lastInputChange < 400) return;
 
                         _state.searchText = _state.newSearchText;
-                        (_state.newSearchText !== '') && onQuerySearch();
+                        if (_state.newSearchText !== '') {
+                            onQuerySearch();
+                        } else {
+                            api.asc_endFindText();
+                        }
                         clearInterval(_searchTimer);
                         _searchTimer = undefined;
                     }, 10);
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index df7ca46a9..e0bf2cd81 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -154,6 +154,8 @@ define([
 
                         me._state.searchText = me._state.newSearchText;
                         if (!(me._state.newSearchText !== '' && me.onQuerySearch()) && me._state.newSearchText === '') {
+                            me.api.asc_endFindText();
+                            me.hideResults();
                             me.view.updateResultsNumber('no-results');
                             me.view.disableNavButtons();
                             me.view.disableReplaceButtons(true);
diff --git a/apps/presentationeditor/embed/js/SearchBar.js b/apps/presentationeditor/embed/js/SearchBar.js
index d56663f19..9c76aa222 100644
--- a/apps/presentationeditor/embed/js/SearchBar.js
+++ b/apps/presentationeditor/embed/js/SearchBar.js
@@ -115,7 +115,11 @@
                         if ((new Date()) - _lastInputChange < 400) return;
 
                         _state.searchText = _state.newSearchText;
-                        (_state.newSearchText !== '') && onQuerySearch();
+                        if (_state.newSearchText !== '') {
+                            onQuerySearch();
+                        } else {
+                            api.asc_endFindText();
+                        }
                         clearInterval(_searchTimer);
                         _searchTimer = undefined;
                     }, 10);
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index 1e89fecfb..248934c6c 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -151,6 +151,8 @@ define([
 
                         me._state.searchText = me._state.newSearchText;
                         if (!(me._state.newSearchText !== '' && me.onQuerySearch()) && me._state.newSearchText === '') {
+                            me.api.asc_endFindText();
+                            me.hideResults();
                             me.view.updateResultsNumber('no-results');
                             me.view.disableNavButtons();
                             me.view.disableReplaceButtons(true);