From e7ba2e0180b9068e62509807a58e8cdf404d4f35 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 6 Dec 2022 16:33:48 +0300
Subject: [PATCH] [DE PE SSE] By bug 58696

---
 apps/common/main/lib/view/SearchPanel.js         | 16 ++++++++++++++--
 .../common/main/resources/less/searchdialog.less |  6 ++++++
 .../documenteditor/main/app/controller/Search.js |  2 +-
 .../main/app/controller/Search.js                |  2 +-
 .../main/app/controller/Search.js                |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js
index 65cfa369f..85b47446d 100644
--- a/apps/common/main/lib/view/SearchPanel.js
+++ b/apps/common/main/lib/view/SearchPanel.js
@@ -334,11 +334,23 @@ define([
         ChangeSettings: function(props) {
         },
 
+        updateScrollers: function () {
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            this.$searchContainer.scroller.update({alwaysVisibleY: true});
+
+            setTimeout(_.bind(function () {
+                if (this.$searchContainer.find('> .ps-scrollbar-y-rail').is(':visible')) {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').addClass('set-left');
+                } else {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').removeClass('set-left');
+                }
+            }, this), 100);
+        },
+
         updateResultsContainerHeight: function () {
             if (this.$resultsContainer) {
                 this.$resultsContainer.outerHeight(Math.max($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight(), 112));
-                this.$resultsContainer.scroller.update({alwaysVisibleY: true});
-                this.$searchContainer.scroller.update({alwaysVisibleY: false});
+                this.updateScrollers();
             }
         },
 
diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less
index 832256455..09eefb392 100644
--- a/apps/common/main/resources/less/searchdialog.less
+++ b/apps/common/main/resources/less/searchdialog.less
@@ -262,6 +262,12 @@
                 font-style: italic;
             }
         }
+
+        .ps-scrollbar-y-rail {
+            &.set-left {
+                right: 11px !important;
+            }
+        }
     }
 
     #search-container {
diff --git a/apps/documenteditor/main/app/controller/Search.js b/apps/documenteditor/main/app/controller/Search.js
index 47c16acd6..23b9fbd25 100644
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@@ -333,7 +333,7 @@ define([
         onEndTextAroundSearch: function () {
             if (this.view) {
                 this._state.isStartedAddingResults = false;
-                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.view.updateScrollers();
             }
         },
 
diff --git a/apps/presentationeditor/main/app/controller/Search.js b/apps/presentationeditor/main/app/controller/Search.js
index bc4ca16a4..803114b60 100644
--- a/apps/presentationeditor/main/app/controller/Search.js
+++ b/apps/presentationeditor/main/app/controller/Search.js
@@ -299,7 +299,7 @@ define([
         onEndTextAroundSearch: function () {
             if (this.view) {
                 this._state.isStartedAddingResults = false;
-                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.view.updateScrollers();
             }
         },
 
diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js
index b327d9820..efbbeda6f 100644
--- a/apps/spreadsheeteditor/main/app/controller/Search.js
+++ b/apps/spreadsheeteditor/main/app/controller/Search.js
@@ -429,7 +429,7 @@ define([
         onEndTextAroundSearch: function () {
             if (this.view) {
                 this._state.isStartedAddingResults = false;
-                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.view.updateScrollers();
             }
         },