From 0e7e21fc13e26278702f1aed1c2df19e91a602d8 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Mon, 29 May 2023 23:30:20 +0300
Subject: [PATCH] [SSE] By bug 58072

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

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index a8bb9ef574..e5dabc0834 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -191,9 +191,9 @@ define([
                         editable: false,
                         cls: 'input-group-nr',
                         data: [
-                            { value: 0, displayValue: this.textSheet },
-                            { value: 1, displayValue: this.textWorkbook },
-                            { value: 2, displayValue: this.textSpecificRange}
+                            { value: Asc.c_oAscSearchBy.Sheet, displayValue: this.textSheet },
+                            { value: Asc.c_oAscSearchBy.Workbook, displayValue: this.textWorkbook },
+                            { value: Asc.c_oAscSearchBy.Range, displayValue: this.textSpecificRange}
                         ],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -260,7 +260,7 @@ define([
                         this.$searchOptionsBlock.addClass('no-expand');
                     }
 
-                    this.cmbWithin.setValue(0);
+                    this.cmbWithin.setValue(Asc.c_oAscSearchBy.Sheet);
                     this.cmbSearch.setValue(0);
                     this.cmbLookIn.setValue(0);
 
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 59db81afc0..c0b45edb45 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -147,6 +147,13 @@ define([
             this.view.inputSelectRange.on('button:click', _.bind(this.onRangeSelect, this));
         },
 
+        changeWithinSheet: function (value) {
+            this._state.withinSheet = value;
+            this.view.inputSelectRange.setDisabled(value !== Asc.c_oAscSearchBy.Range);
+            this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide']();
+            this.view.updateResultsContainerHeight();
+        },
+
         onChangeSearchOption: function (option, value, noSearch) {
             var runSearch = true;
             switch (option) {
@@ -160,13 +167,10 @@ define([
                     this._state.useRegExp = value;
                     break;
                 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);
+                    this.changeWithinSheet(value);
                     if (value === Asc.c_oAscSearchBy.Range) {
                         runSearch = this._state.isValidSelectedRange && !!this._state.selectedRange;
                     }
-                    this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide']();
-                    this.view.updateResultsContainerHeight();
                     break;
                 case 'range':
                     this._state.selectedRange = value;
@@ -518,6 +522,18 @@ define([
                 viewport.searchBar.hide();
             }
 
+            var activeRange = this.api.asc_getActiveRangeStr(Asc.referenceType.A, null, null, true),
+                isRangeChanged = false;
+            if (activeRange !== null) {
+                this.changeWithinSheet(Asc.c_oAscSearchBy.Range);
+                this._state.selectedRange = activeRange;
+
+                this.view.cmbWithin.setValue(Asc.c_oAscSearchBy.Range);
+                this.view.inputSelectRange.setValue(activeRange);
+
+                isRangeChanged = true;
+            }
+
             var selectedText = this.api.asc_GetSelectedText(),
                 text = typeof findText === 'string' ? findText : (selectedText && selectedText.trim() || this._state.searchText);
             if (this.resultItems && this.resultItems.length > 0 || (!text && this._state.isResults)) {
@@ -526,8 +542,8 @@ define([
                     this.onQuerySearch();
                     return;
                 }
-                if (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
-                    this._state.matchCase && text === this.view.inputText.getValue()) { // show old results
+                if (!isRangeChanged && (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
+                    this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
                     return;
                 }
             }
@@ -541,7 +557,7 @@ define([
             }
 
             this.hideResults();
-            if (this._state.searchText !== undefined && text && text === this._state.searchText && this._state.isResults) { // search was made
+            if (!isRangeChanged && this._state.searchText !== undefined && text && text === this._state.searchText && this._state.isResults) { // search was made
                 this.api.asc_StartTextAroundSearch();
             } else if (this._state.searchText) { // search wasn't made
                 this._state.searchText = text;