From d7187b9b8ce6094070398b3b51c6aa4a5166637e Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 23 Aug 2022 18:30:49 +0300
Subject: [PATCH] [SSE] Search: fix scroll in results container

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

diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index 9435e4cd5..bb60e2949 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -370,7 +370,6 @@ define([
                         this.resultItems[current].selected = true;
                         $('#search-results').find('.item').removeClass('selected');
                         this.resultItems[current].$el.addClass('selected');
-                        this.scrollToSelectedResult(current);
                     }
                 }
             }
@@ -411,7 +410,8 @@ define([
             if (this.view && this._state.isStartedAddingResults) {
                 if (data.length > 300 || !data.length) return;
                 var me = this,
-                    $innerResults = me.view.$resultsContainer.find('.search-items');
+                    $innerResults = me.view.$resultsContainer.find('.search-items'),
+                    selectedInd;
                 me.resultItems = [];
                 data.forEach(function (item, ind) {
                     var isSelected = ind === me._state.currentResult;
@@ -426,6 +426,7 @@ define([
                     if (isSelected) {
                         $item.addClass('selected');
                         me._state.lastSelectedItem = item;
+                        selectedInd = ind;
                     }
                     var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected, data: item};
                     me.resultItems.push(resultItem);
@@ -441,6 +442,7 @@ define([
                     me.addTooltips($item, item);
                 });
                 this.view.$resultsContainer.show();
+                this.scrollToSelectedResult(selectedInd);
             }
         },