From 749ba979f4cd80a0d8e7023e910c848bbf465d88 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 22 Aug 2022 18:48:47 +0300 Subject: [PATCH 1/6] [SSE] Search: send selected result item --- apps/common/main/lib/view/SearchPanel.js | 6 +++-- .../main/app/controller/Search.js | 25 +++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js index d0170ce25..4bb2bd81c 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -335,7 +335,8 @@ define([ } else { text = current === 'no-results' ? this.textNoSearchResults : (current === 'stop' ? this.textSearchHasStopped : - (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count))); + (current === 'content-changed' ? this.textContentChanged : + (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count)))); } this.$reaultsNumber.text(text); !window.SSE && this.disableReplaceButtons(!count); @@ -422,7 +423,8 @@ define([ textCell: 'Cell', textValue: 'Value', textFormula: 'Formula', - textSearchHasStopped: 'Search has stopped' + textSearchHasStopped: 'Search has stopped', + textContentChanged: 'Document content has changed.' }, Common.Views.SearchPanel || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index cd4854748..66909cde0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -93,7 +93,9 @@ define([ withinSheet: Asc.c_oAscSearchBy.Sheet, searchByRows: true, lookInFormulas: true, - isValidSelectedRange: true + isValidSelectedRange: true, + lastSelectedItem: undefined, + isContentChanged: false }; }, @@ -111,8 +113,8 @@ define([ this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this)); this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this)); this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this)); - this.api.asc_registerCallback('asc_onSearchEnd', _.bind(this.onApiSearchEnd, this)); this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onActiveSheetChanged, this)); + this.api.asc_registerCallback('asc_onModifiedDocument', _.bind(this.onApiModifiedDocument, this)); } return this; }, @@ -259,6 +261,8 @@ define([ return; } + this._state.isContentChanged = false; + var options = new Asc.asc_CFindOptions(); options.asc_setFindWhat(this._state.searchText); options.asc_setScanForward(d != 'back'); @@ -271,6 +275,7 @@ define([ options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); options.asc_setNeedRecalc(isNeedRecalc); + options.asc_setLastSearchElem(this._state.lastSelectedItem); if (!this.api.asc_findText(options)) { this.resultItems = []; this.view.updateResultsNumber(undefined, 0); @@ -296,6 +301,7 @@ define([ } options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); + options.asc_setLastSearchElem(this._state.lastSelectedItem); options.asc_setIsReplaceAll(false); this.api.asc_replaceText(options); @@ -314,6 +320,7 @@ define([ } options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); + options.asc_setLastSearchElem(this._state.lastSelectedItem); options.asc_setIsReplaceAll(true); this.api.asc_replaceText(options); @@ -345,6 +352,7 @@ define([ } options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); + options.asc_setLastSearchElem(this._state.lastSelectedItem); if (!this.api.asc_findText(options)) { this.removeResultItems(); } @@ -384,6 +392,7 @@ define([ item.selected = false; }); if (this.resultItems[current]) { + this._state.lastSelectedItem = this.resultItems[current].data; this.resultItems[current].selected = true; $('#search-results').find('.item').removeClass('selected'); this.resultItems[current].$el.addClass('selected'); @@ -443,9 +452,14 @@ define([ if (isSelected) { $item.addClass('selected'); } - var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected, data: data}; + var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected, data: item}; me.resultItems.push(resultItem); $item.on('click', _.bind(function (el) { + if (me._state.isContentChanged) { + me._state.lastSelectedItem = item; + me.onQuerySearch(); + return; + } var id = item[0]; me.api.asc_SelectSearchElement(id); }, me)); @@ -551,8 +565,9 @@ define([ } }, - onApiSearchEnd: function () { - this.removeResultItems('stop'); + onApiModifiedDocument: function () { + this._state.isContentChanged = true; + this.view.updateResultsNumber('content-changed'); }, onActiveSheetChanged: function (index) { From 235af538e87973c7ee28bbf11a028cba6cdcabfa Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 23 Aug 2022 12:03:31 +0300 Subject: [PATCH 2/6] [SSE] Search: fix updating of selected item when new results are sent --- apps/spreadsheeteditor/main/app/controller/Search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index 66909cde0..8377e35ee 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -451,6 +451,7 @@ define([ var $item = $(tr).appendTo($innerResults); if (isSelected) { $item.addClass('selected'); + me._state.lastSelectedItem = item; } var resultItem = {id: item[0], $el: $item, el: tr, selected: isSelected, data: item}; me.resultItems.push(resultItem); From b7ee795365bca8c4f889a335c1794cfb680787ff Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 23 Aug 2022 15:31:13 +0300 Subject: [PATCH 3/6] [SSE] Search: fix actions after query search, refactoring --- .../main/app/controller/Search.js | 71 +++++-------------- 1 file changed, 16 insertions(+), 55 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index 8377e35ee..bd6410931 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -168,12 +168,7 @@ define([ break; } if (runSearch) { - this.hideResults(); - if (this.onQuerySearch()) { - this.searchTimer && clearInterval(this.searchTimer); - this.searchTimer = undefined; - this.api.asc_StartTextAroundSearch(); - } + this.onQuerySearch(); } }, @@ -207,16 +202,7 @@ define([ var isReturnKey = type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN; if (isReturnKey || type !== 'keydown') { this._state.searchText = text; - if (this.onQuerySearch(type) && (this.searchTimer || isReturnKey)) { - this.hideResults(); - if (this.searchTimer) { - clearInterval(this.searchTimer); - this.searchTimer = undefined; - } - if (this.view.$el.is(':visible')) { - this.api.asc_StartTextAroundSearch(); - } - } + this.onQuerySearch(type); } }, @@ -229,25 +215,21 @@ define([ this.searchTimer = setInterval(function(){ if ((new Date()) - me._lastInputChange < 400) return; - me.hideResults(); me._state.searchText = me._state.newSearchText; - if (me.onQuerySearch()) { - if (me.view.$el.is(':visible')) { - me.api.asc_StartTextAroundSearch(); - } - } else if (me._state.newSearchText === '') { + if (!me.onQuerySearch() && me._state.newSearchText === '') { me.view.updateResultsNumber('no-results'); me.view.disableNavButtons(); Common.NotificationCenter.trigger('search:updateresults', undefined, 0); } - clearInterval(me.searchTimer); - me.searchTimer = undefined; }, 10); } } }, onQuerySearch: function (d, isNeedRecalc) { + this.searchTimer && clearInterval(this.searchTimer); + this.searchTimer = undefined; + var me = this; if (this._state.withinSheet === Asc.c_oAscSearchBy.Range && !this._state.isValidSelectedRange) { Common.UI.warning({ @@ -261,7 +243,7 @@ define([ return; } - this._state.isContentChanged = false; + this.hideResults(); var options = new Asc.asc_CFindOptions(); options.asc_setFindWhat(this._state.searchText); @@ -275,16 +257,16 @@ define([ options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); options.asc_setNeedRecalc(isNeedRecalc); - options.asc_setLastSearchElem(this._state.lastSelectedItem); + this._state.isContentChanged && options.asc_setLastSearchElem(this._state.lastSelectedItem); + this._state.isContentChanged = false; if (!this.api.asc_findText(options)) { - this.resultItems = []; - this.view.updateResultsNumber(undefined, 0); - this._state.currentResult = 0; - this._state.resultsNumber = 0; - this.view.disableNavButtons(); - Common.NotificationCenter.trigger('search:updateresults', undefined, 0); + this.removeResultItems(); return false; } + + if (this.view.$el.is(':visible')) { + this.api.asc_StartTextAroundSearch(); + } return true; }, @@ -301,7 +283,6 @@ define([ } options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); - options.asc_setLastSearchElem(this._state.lastSelectedItem); options.asc_setIsReplaceAll(false); this.api.asc_replaceText(options); @@ -320,7 +301,6 @@ define([ } options.asc_setScanByRows(this._state.searchByRows); options.asc_setLookIn(this._state.lookIn ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); - options.asc_setLastSearchElem(this._state.lastSelectedItem); options.asc_setIsReplaceAll(true); this.api.asc_replaceText(options); @@ -341,21 +321,7 @@ define([ }); } } else { - var options = new Asc.asc_CFindOptions(); - options.asc_setFindWhat(this._state.searchText); - options.asc_setScanForward(true); - options.asc_setIsMatchCase(this._state.matchCase); - options.asc_setIsWholeCell(this._state.matchWord); - options.asc_setScanOnOnlySheet(this._state.withinSheet); - if (this._state.withinSheet === Asc.c_oAscSearchBy.Range) { - options.asc_setSpecificRange(this._state.selectedRange); - } - options.asc_setScanByRows(this._state.searchByRows); - options.asc_setLookIn(this._state.lookInFormulas ? Asc.c_oAscFindLookIn.Formulas : Asc.c_oAscFindLookIn.Value); - options.asc_setLastSearchElem(this._state.lastSelectedItem); - if (!this.api.asc_findText(options)) { - this.removeResultItems(); - } + this.onQuerySearch(); } }, @@ -573,12 +539,7 @@ define([ onActiveSheetChanged: function (index) { if (this._state.isHighlightedResults && this._state.withinSheet === Asc.c_oAscSearchBy.Sheet) { - this.hideResults(); - if (this.onQuerySearch(undefined, true)) { - this.searchTimer && clearInterval(this.searchTimer); - this.searchTimer = undefined; - this.api.asc_StartTextAroundSearch(); - } + this.onQuerySearch(undefined, true); } }, From 7cb996c360ac019ab1ab5a674bccc84770d7b863 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 23 Aug 2022 17:33:00 +0300 Subject: [PATCH 4/6] [SSE] Search: fix message when document is changed --- apps/common/main/lib/view/SearchPanel.js | 32 +++++++++++++------ .../main/resources/less/searchdialog.less | 6 ++++ apps/spreadsheeteditor/main/locale/en.json | 2 ++ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js index 4bb2bd81c..11dc0ebdb 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -285,8 +285,7 @@ define([ }); } Common.NotificationCenter.on('window:resize', function() { - me.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); - me.$resultsContainer.scroller.update({alwaysVisibleY: true}); + me.updateResultsContainerHeight(); }); } @@ -299,8 +298,7 @@ define([ Common.UI.BaseView.prototype.show.call(this,arguments); this.fireEvent('show', this ); - this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); - this.$resultsContainer.scroller.update({alwaysVisibleY: true}); + this.updateResultsContainerHeight(); }, hide: function () { @@ -328,6 +326,13 @@ define([ ChangeSettings: function(props) { }, + updateResultsContainerHeight: function () { + if (this.$resultsContainer) { + this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); + this.$resultsContainer.scroller.update({alwaysVisibleY: true}); + } + }, + updateResultsNumber: function (current, count) { var text; if (count > 300) { @@ -335,10 +340,19 @@ define([ } else { text = current === 'no-results' ? this.textNoSearchResults : (current === 'stop' ? this.textSearchHasStopped : - (current === 'content-changed' ? this.textContentChanged : + (current === 'content-changed' ? (this.textContentChanged + ' ' + Common.Utils.String.format(this.textSearchAgain, '','')) : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count)))); } - this.$reaultsNumber.text(text); + if (current === 'content-changed') { + var me = this; + this.$reaultsNumber.html(text); + this.$reaultsNumber.find('.search-again').on('click', function () { + me.fireEvent('search:next', [me.inputText.getValue(), true]); + }); + } else { + this.$reaultsNumber.text(text); + } + this.updateResultsContainerHeight(); !window.SSE && this.disableReplaceButtons(!count); }, @@ -368,8 +382,7 @@ define([ this.$searchOptionsBlock[this.extendedOptions ? 'removeClass' : 'addClass']('no-expand'); Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions); - this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight()); - this.$resultsContainer.scroller.update({alwaysVisibleY: true}); + this.updateResultsContainerHeight(); }, setFindText: function (val) { @@ -424,7 +437,8 @@ define([ textValue: 'Value', textFormula: 'Formula', textSearchHasStopped: 'Search has stopped', - textContentChanged: 'Document content has changed.' + textContentChanged: 'Document content has changed.', + textSearchAgain: '{0}Search again{1} to make sure the results are current.' }, Common.Views.SearchPanel || {})); }); \ No newline at end of file diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less index f134428be..e96e720ef 100644 --- a/apps/common/main/resources/less/searchdialog.less +++ b/apps/common/main/resources/less/searchdialog.less @@ -159,6 +159,12 @@ width: calc(100% - 48px); color: @text-secondary-ie; color: @text-secondary; + + .search-again { + color: @text-secondary; + cursor: pointer; + text-decoration: underline; + } } .search-nav-btns { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index e08453090..11f8a3328 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -423,6 +423,8 @@ "Common.Views.SearchPanel.textWorkbook": "Workbook", "Common.Views.SearchPanel.tipNextResult": "Next result", "Common.Views.SearchPanel.tipPreviousResult": "Previous result", + "Common.Views.SearchPanel.textContentChanged": "Document content has changed.", + "Common.Views.SearchPanel.textSearchAgain": "{0}Search again{1} to make sure the results are current.", "Common.Views.SelectFileDlg.textLoading": "Loading", "Common.Views.SelectFileDlg.textTitle": "Select Data Source", "Common.Views.SignDialog.textBold": "Bold", From 7e7e72e1f3c6a4b786b23ae671b4b0415b9ecdd5 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 23 Aug 2022 18:00:34 +0300 Subject: [PATCH 5/6] [SSE] Search: not replace when document is changed --- apps/spreadsheeteditor/main/app/controller/Search.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index bd6410931..9435e4cd5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -271,6 +271,10 @@ define([ }, onQueryReplace: function(textSearch, textReplace) { + if (this._state.isContentChanged) { + this.onQuerySearch(); + return; + } this.api.isReplaceAll = false; var options = new Asc.asc_CFindOptions(); options.asc_setFindWhat(textSearch); @@ -289,6 +293,10 @@ define([ }, onQueryReplaceAll: function(textSearch, textReplace) { + if (this._state.isContentChanged) { + this.onQuerySearch(); + return; + } this.api.isReplaceAll = true; var options = new Asc.asc_CFindOptions(); options.asc_setFindWhat(textSearch); From d7187b9b8ce6094070398b3b51c6aa4a5166637e Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 23 Aug 2022 18:30:49 +0300 Subject: [PATCH 6/6] [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); } },