From 0d9b07a6e468c6822fbfe619aa93e152ba46da40 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 29 Aug 2022 15:04:43 +0300
Subject: [PATCH 1/2] Fix Bug 57826

---
 apps/common/main/lib/util/utils.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index 03aac86ae..b1d58e132 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -997,23 +997,27 @@ jQuery.fn.extend({
         var _el = document.getElementById(id.substring(1));
         if ( !_el ) {
             parent = parent || this;
-            if ( parent instanceof jQuery ) {
+            if ( parent && parent.length > 0 ) {
                 parent.each(function (i, node) {
-                    _el = node.querySelectorAll(id);
-                    if ( _el.length == 0 ) {
-                        if ( ('#' + node.id) == id ) {
-                            _el = node;
+                    if (node.querySelectorAll) {
+                        _el = node.querySelectorAll(id);
+                        if ( _el.length == 0 ) {
+                            if ( ('#' + node.id) == id ) {
+                                _el = node;
+                                return false;
+                            }
+                        } else
+                        if ( _el.length ) {
+                            _el = _el[0];
                             return false;
                         }
-                    } else
-                    if ( _el.length ) {
-                        _el = _el[0];
-                        return false;
                     }
                 })
             } else {
-                _el = parent.querySelectorAll(id);
-                if ( _el && _el.length ) return _el[0];
+                if (parent && parent.querySelectorAll) {
+                    _el = parent.querySelectorAll(id);
+                    if ( _el && _el.length ) return _el[0];
+                }
             }
         }
 

From fe64f41b88a1285d558c36d9b448d4971673763d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 29 Aug 2022 16:55:13 +0300
Subject: [PATCH 2/2] Fix Bug 58457

---
 .../main/app/controller/Toolbar.js            | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index d3b1d5de2..eb82d6b5d 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -2143,9 +2143,29 @@ define([
 //            }
         },
 
-        onTableTplMenuOpen: function(cmp) {
+        onTableTplMenuOpen: function(menu) {
             this.onApiInitTableTemplates(this.api.asc_getTablePictures(this.api.asc_getCellInfo().asc_getFormatTableInfo()));
 
+            if (menu && this.toolbar.mnuTableTemplatePicker) {
+                var picker = this.toolbar.mnuTableTemplatePicker,
+                    columnCount = 7;
+
+                if (picker.cmpEl) {
+                    var itemEl = $(picker.cmpEl.find('.dataview.inner .item-template').get(0)).parent(),
+                        itemMargin = 8,
+                        itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) : 60;
+
+                    var menuWidth = columnCount * (itemMargin + itemWidth) + 11, // for scroller
+                        menuMargins = parseFloat(picker.cmpEl.css('margin-left')) + parseFloat(picker.cmpEl.css('margin-right'));
+                    if (menuWidth + menuMargins>Common.Utils.innerWidth())
+                        menuWidth = Math.max(Math.floor((Common.Utils.innerWidth()-menuMargins-11)/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth) + 11;
+                    picker.cmpEl.css({
+                        'width': menuWidth
+                    });
+                    menu.alignPosition();
+                }
+            }
+
             var scroller = this.toolbar.mnuTableTemplatePicker.scroller;
             if (scroller) {
                 scroller.update({alwaysVisibleY: true});