From 3d24b01699dcecc6aeb1aeb0e19c306b133ad56a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Sun, 4 Dec 2022 18:30:48 +0300 Subject: [PATCH 1/2] [DE PE SSE] Fix bug 58696 --- .../main/lib/template/SearchPanel.template | 2 ++ apps/common/main/lib/view/SearchPanel.js | 10 +++++++++- .../main/resources/less/searchdialog.less | 19 +++++++++++-------- .../main/resources/less/leftmenu.less | 1 + 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/template/SearchPanel.template b/apps/common/main/lib/template/SearchPanel.template index f9025bf788..a3c9f23c30 100644 --- a/apps/common/main/lib/template/SearchPanel.template +++ b/apps/common/main/lib/template/SearchPanel.template @@ -3,6 +3,7 @@
+
@@ -60,4 +61,5 @@
+ \ 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 cb43db8981..65cfa369f8 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -176,6 +176,13 @@ define([ this.$resultsContainer = $('#search-results'); this.$resultsContainer.hide(); + this.$searchContainer = $('#search-container'); + this.$searchContainer.scroller = new Common.UI.Scroller({ + el : $('#search-container'), + useKeyboard : true, + minScrollbarLength: 40 + }); + Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this)); if (window.SSE) { this.cmbWithin = new Common.UI.ComboBox({ @@ -329,8 +336,9 @@ define([ updateResultsContainerHeight: function () { if (this.$resultsContainer) { - this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); + 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}); } }, diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less index e96e720eff..832256455e 100644 --- a/apps/common/main/resources/less/searchdialog.less +++ b/apps/common/main/resources/less/searchdialog.less @@ -136,10 +136,7 @@ } #search-adv-settings { - position: absolute; - left: 0; - right: 0; - top: 45px; + position: relative; padding: 10px 15px 0 15px; table { @@ -238,10 +235,7 @@ } #search-results { - position: absolute; - left: 0; - right: 0; - bottom: 0; + position: relative; width: 100%; border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value solid @border-toolbar; @@ -270,4 +264,13 @@ } } + #search-container { + position: absolute; + overflow: hidden; + top: 45px; + left: 0; + right: 0; + bottom: 0; + } + } \ 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 33193e4a04..355c644825 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -779,6 +779,7 @@ top: 28px; width: 100%; overflow: hidden; + padding-bottom: 10px; .item { padding: 0; display: flex; From e7ba2e0180b9068e62509807a58e8cdf404d4f35 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 6 Dec 2022 16:33:48 +0300 Subject: [PATCH 2/2] [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 65cfa369f8..85b47446db 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 832256455e..09eefb3925 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 47c16acd6d..23b9fbd25d 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 bc4ca16a49..803114b604 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 b327d98209..efbbeda6fb 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(); } },