From 4b2fd93bd326fe313fb1922892cb05f343952adc Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 7 Dec 2021 15:52:12 +0300
Subject: [PATCH 1/2] [SSE] Fix bug 54388

---
 apps/common/main/lib/component/DataView.js    |  9 ++++--
 apps/common/main/lib/component/HintManager.js |  4 +++
 apps/common/main/lib/component/ListView.js    |  2 +-
 .../main/app/template/LeftMenu.template       |  2 +-
 .../main/app/view/Spellcheck.js               | 31 ++++++++++++++-----
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index 86db1a9a7..6740c46d5 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -299,7 +299,8 @@ define([
                 this.cmpEl = $(this.template({
                     groups: me.groups ? me.groups.toJSON() : null,
                     style: me.style,
-                    cls: me.cls
+                    cls: me.cls,
+                    options: me.options
                 }));
 
                 parentEl.html(this.cmpEl);
@@ -308,7 +309,8 @@ define([
                 this.cmpEl.html(this.template({
                     groups: me.groups ? me.groups.toJSON() : null,
                     style: me.style,
-                    cls: me.cls
+                    cls: me.cls,
+                    options: me.options
                 }));
             }
 
@@ -506,7 +508,8 @@ define([
             $(this.el).html(this.template({
                 groups: this.groups ? this.groups.toJSON() : null,
                 style: this.style,
-                cls: this.cls
+                cls: this.cls,
+                options: this.options
             }));
 
             if (!_.isUndefined(this.scroller)) {
diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js
index dbe0c4e3b..0eab7c6e6 100644
--- a/apps/common/main/lib/component/HintManager.js
+++ b/apps/common/main/lib/component/HintManager.js
@@ -500,6 +500,10 @@ Common.UI.HintManager = new(function() {
                                 curr.trigger(jQuery.Event('click', {which: 1}));
                                 curr.focus();
                                 _resetToDefault();
+                            } else if (curr.hasClass('listview')) {
+                                _hideHints();
+                                curr.focus();
+                                _resetToDefault();
                             } else {
                                 _isComplete = false;
                                 _hideHints();
diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js
index 67b3824ba..f796d38bb 100644
--- a/apps/common/main/lib/component/ListView.js
+++ b/apps/common/main/lib/component/ListView.js
@@ -59,7 +59,7 @@ define([
             },
 
             template: _.template([
-                '<div class="listview inner <%= cls %>"></div>'
+                '<div class="listview inner <%= cls %>" <% if (options.dataHint) { %> data-hint="<%= options.dataHint %>" <% } if (options.dataHintDirection) { %> data-hint-direction="<%= options.dataHintDirection %>" <% } if (options.dataHintOffset) { %> data-hint-offset="<%= options.dataHintOffset %>" <% } %>></div>'
             ].join('')),
 
             onResetItems : function() {
diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
index c11a45dac..b8da605c1 100644
--- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
@@ -6,7 +6,7 @@
         <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
         <!-- /** coauthoring end **/ -->
         <button id="left-btn-plugins" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
-        <button id="left-btn-spellcheck" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
+        <button id="left-btn-spellcheck" class="btn btn-category" content-target="left-panel-spellcheck" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
         <button id="left-btn-support" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
         <button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
     </div>
diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
index 0264df328..f5486fa58 100644
--- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js
+++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
@@ -60,7 +60,7 @@ define([
                 '<div id="spellcheck-suggestions-list"></div>',
                 '<div id="spellcheck-change" style=""></div>',
                 '<div id="spellcheck-ignore" class="padding-large"></div>',
-                '<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary"><%= scope.txtAddToDictionary %></button>',
+                '<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAddToDictionary %></button>',
                 '<label class="header" style="display: block;"><%= scope.txtDictionaryLanguage %></label>',
                 '<div id="spellcheck-dictionary-language"></div>',
                 '<div id="spellcheck-complete" class="hidden">',
@@ -84,7 +84,10 @@ define([
                 el : $('#spellcheck-current-word'),
                 allowBlank  : true,
                 validateOnBlur: false,
-                disabled: true
+                disabled: true,
+                dataHint: '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'big'
             });
 
             this.buttonNext = new Common.UI.Button({
@@ -92,14 +95,19 @@ define([
                 style: 'margin-left: 5px;',
                 cls: 'btn-toolbar bg-white',
                 iconCls: 'toolbar__icon btn-nextitem',
-                hint: this.txtNextTip
+                hint: this.txtNextTip,
+                dataHint: '1',
+                dataHintDirection: 'top'
             });
 
             this.suggestionList = new Common.UI.ListView({
                 el: $('#spellcheck-suggestions-list'),
                 emptyText: this.noSuggestions,
                 store: new Common.UI.DataViewStore(),
-                scrollAlwaysVisible: true
+                scrollAlwaysVisible: true,
+                dataHint: '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'big'
             });
 
             this.btnChange = new Common.UI.Button({
@@ -121,7 +129,10 @@ define([
                             value: 1
                         }
                         ]
-                })
+                }),
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
             });
 
             this.btnIgnore = new Common.UI.Button({
@@ -143,7 +154,10 @@ define([
                             value: 1
                         }
                     ]
-                })
+                }),
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
             });
 
             this.cmbDictionaryLanguage = new Common.UI.ComboBox({
@@ -155,7 +169,10 @@ define([
                 scroller    : {
                     suppressScrollX: true
                 },
-                search: true
+                search: true,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
             });
 
             this.btnToDictionary = new Common.UI.Button({

From 4c9680bbd62b9b3e02cee8d3fa0fcf3c8a528b22 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 7 Dec 2021 17:09:44 +0300
Subject: [PATCH 2/2] [SSE] Fix bug 53670

---
 apps/spreadsheeteditor/main/app/controller/Main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 8414bbd08..f45927bd1 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -720,6 +720,7 @@ define([
                     case Asc.c_oAscAsyncAction.ForceSaveTimeout:
                         clearTimeout(this._state.timerSave);
                         force   = true;
+                        title   = this.saveTitleText;
                         text    = (!this.appOptions.isOffline) ? this.saveTextText : '';
                         break;