From 148c8a58912f03a644e6065d3f0581f0e38d2147 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 12 Jul 2022 23:56:02 +0300
Subject: [PATCH 1/7] Fix Bug 57454

---
 apps/documenteditor/main/app/controller/Toolbar.js     | 1 +
 apps/presentationeditor/main/app/controller/Toolbar.js | 1 +
 apps/spreadsheeteditor/main/app/controller/Toolbar.js  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 7ad5c52b2..aafe23e8e 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -3190,6 +3190,7 @@ define([
                     me.toolbar.btnPaste.$el.detach().appendTo($box);
                     me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom');
                     me.toolbar.btnCopy.$el.removeClass('split');
+                    me.toolbar.processPanelVisible(null, true, true);
                 }
 
                 if ( config.isDesktopApp ) {
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index a666f5e01..7be6a9554 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -2606,6 +2606,7 @@ define([
                     me.toolbar.btnPaste.$el.detach().appendTo($box);
                     me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom');
                     me.toolbar.btnCopy.$el.removeClass('split');
+                    me.toolbar.processPanelVisible(null, true, true);
                 }
 
                 if ( config.isDesktopApp ) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 37f2b38da..d3b1d5de2 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -4303,6 +4303,7 @@ define([
                         me.toolbar.btnPaste.$el.detach().appendTo($box);
                         me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom');
                         me.toolbar.btnCopy.$el.removeClass('split');
+                        me.toolbar.processPanelVisible(null, true, true);
                     }
 
                     var tab = {action: 'protect', caption: me.toolbar.textTabProtect, layoutname: 'toolbar-protect', dataHintTitle: 'T'};

From a7b640b7419591d8809f61cf5f5377f2a2e55d75 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 13 Jul 2022 12:08:54 +0300
Subject: [PATCH 2/7] Fix Bug 57874 (fix More button for FireFox and IE11)

---
 apps/common/main/lib/component/Mixtbar.js | 3 ++-
 apps/common/main/lib/util/utils.js        | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 9b452c354..8040d00cb 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -503,7 +503,8 @@ define([
             setMoreButton: function(tab, panel) {
                 var me = this;
                 if (!btnsMore[tab]) {
-                    var box = $('<div class="more-box" style="position: absolute;right: 0; padding-left: 12px;padding-right: 6px;display: none;">' +
+                    var top = panel.offset().top;
+                    var box = $('<div class="more-box" style="position: absolute;right: 0; top:'+ top +'px; padding-left: 12px;padding-right: 6px;display: none;">' +
                         '<div class="separator long" style="position: relative;display: table-cell;"></div>' +
                         '<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
                         '</div>');
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index 52ca72d75..03aac86ae 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -193,13 +193,18 @@ var utils = new(function() {
             me.innerHeight = window.innerHeight * me.zoom;
             me.applicationPixelRatio = scale.applicationPixelRatio || scale.devicePixelRatio;
         };
+        checkSizeIE = function() {
+            me.innerWidth = window.innerWidth;
+            me.innerHeight = window.innerHeight;
+        };
         me.zoom = 1;
         me.applicationPixelRatio = 1;
         me.innerWidth = window.innerWidth;
         me.innerHeight = window.innerHeight;
-        if ( isIE )
+        if ( isIE ) {
             $(document.body).addClass('ie');
-        else {
+            $(window).on('resize', checkSizeIE);
+        } else {
             checkSize();
             $(window).on('resize', checkSize);
         }

From 55f2c25475b881c92aff8d4d2da4e94540ccc3f6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 13 Jul 2022 16:34:48 +0300
Subject: [PATCH 3/7] For Bug 57874

---
 apps/common/main/lib/component/Mixtbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 8040d00cb..cfc80e618 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -503,7 +503,7 @@ define([
             setMoreButton: function(tab, panel) {
                 var me = this;
                 if (!btnsMore[tab]) {
-                    var top = panel.offset().top;
+                    var top = panel.position().top;
                     var box = $('<div class="more-box" style="position: absolute;right: 0; top:'+ top +'px; padding-left: 12px;padding-right: 6px;display: none;">' +
                         '<div class="separator long" style="position: relative;display: table-cell;"></div>' +
                         '<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +

From 634c0b6895627b13e5a3652c804fd0ba70a06915 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 13 Jul 2022 19:30:38 +0300
Subject: [PATCH 4/7] Fix more section (small browser size)

---
 apps/common/main/lib/component/Mixtbar.js             | 11 +++++++++--
 apps/common/main/resources/less/toolbar.less          |  8 +++++++-
 .../documenteditor/main/app/template/Toolbar.template |  1 +
 .../main/app/template/Toolbar.template                |  4 ++++
 .../main/app/template/Toolbar.template                |  1 +
 apps/spreadsheeteditor/main/app/view/PivotTable.js    |  2 ++
 apps/spreadsheeteditor/main/app/view/WBProtection.js  |  2 ++
 7 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index cfc80e618..c1e6c29f8 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -562,7 +562,7 @@ define([
                     var need_break = false;
                     for (var i=items.length-1; i>=0; i--) {
                         var item = $(items[i]);
-                        if (!item.is(':visible')) { // move invisible items as is and set special attr
+                        if (!item.is(':visible') && !item.attr('hidden-on-resize')) { // move invisible items as is and set special attr
                             item.attr('data-hidden-tb-item', true);
                             this.$moreBar.prepend(item);
                             hideAllMenus = true;
@@ -586,6 +586,7 @@ define([
                                 this.$moreBar.prepend(item);
                                 if (last_separator) {
                                     last_separator.css('display', '');
+                                    last_separator.removeAttr('hidden-on-resize');
                                 }
                                 hideAllMenus = true;
                             } else if ( offset.left+item_width > _maxright ) {
@@ -596,6 +597,7 @@ define([
                                         this.$moreBar.prepend(item);
                                         if (last_separator) {
                                             last_separator.css('display', '');
+                                            last_separator.removeAttr('hidden-on-resize');
                                         }
                                         hideAllMenus = true;
                                         break;
@@ -613,6 +615,7 @@ define([
                                                 this.$moreBar.prepend(last_group);
                                                 if (last_separator) {
                                                     last_separator.css('display', '');
+                                                    last_separator.removeAttr('hidden-on-resize');
                                                 }
                                             }
                                             last_group.prepend(child);
@@ -639,6 +642,7 @@ define([
                         } else if (item.hasClass('separator')) {
                             this.$moreBar.prepend(item);
                             item.css('display', 'none');
+                            item.attr('hidden-on-resize', true);
                             last_separator = item;
                             hideAllMenus = true;
                         }
@@ -684,6 +688,7 @@ define([
                                     more_section.before(item);
                                     if (last_separator) {
                                         last_separator.css('display', '');
+                                        last_separator.removeAttr('hidden-on-resize');
                                     }
                                     if (this.$moreBar.children().filter('.group').length == 0) {
                                         this.hideMoreBtns();
@@ -718,6 +723,7 @@ define([
                                                     more_section.before(last_group);
                                                     if (last_separator) {
                                                         last_separator.css('display', '');
+                                                        last_separator.removeAttr('hidden-on-resize');
                                                     }
                                                 }
                                                 last_group.append(child);
@@ -748,6 +754,7 @@ define([
                             } else if (item.hasClass('separator')) {
                                 more_section.before(item);
                                 item.css('display', 'none');
+                                item.attr('hidden-on-resize', true);
                                 last_separator = item;
                                 last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1;
                                 hideAllMenus = true;
@@ -780,7 +787,7 @@ define([
                     right = Common.Utils.innerWidth() - (showxy.left - parentxy.left + target.width()),
                     top = showxy.top - parentxy.top + target.height() + 10;
 
-                moreContainer.css({right: right, left: 'auto', top : top});
+                moreContainer.css({right: right, left: 'auto', top : top, 'max-width': Common.Utils.innerWidth() + 'px'});
                 moreContainer.show();
             },
 
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index c78364c45..23cf89c5b 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -214,6 +214,7 @@
         padding: 12px 10px 7px 0;
         border-radius: 0;
         z-index:999;
+        overflow: hidden;
         .compactwidth {
             .btn-group, .btn-toolbar {
                 &.x-huge {
@@ -258,7 +259,7 @@
         &.small {
             padding-left: 10px;
 
-            + .separator {
+            + .separator:not(.invisible) {
                 margin-left: 10px;
             }
         }
@@ -290,6 +291,11 @@
             margin-left: 5px;
         }
 
+        &.invisible {
+            margin-left: 0;
+            border: none;
+        }
+
         &.long {
             height: 52px;
         }
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 593bd1710..6271e1249 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -86,6 +86,7 @@
                         <span class="btn-slot" id="slot-btn-mailrecepients" data-layout-name="toolbar-home-mailmerge"></span>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 160px;width: 100%; " data-group-width="100%"></div>
             </section>
             <section class="panel" data-tab="ins">
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index e0efc5b52..bf331e84d 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -109,6 +109,7 @@
                         <span class="btn-slot split" id="slot-btn-slidesize"></span>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group flex small field-styles" id="slot-field-styles" style="width: 100%; min-width: 140px;" data-group-width="100%"></div>
             </section>
             <section class="panel" data-tab="ins">
@@ -127,6 +128,7 @@
                     <span class="btn-slot text x-huge slot-insertimg"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small" id="slot-combo-insertshape"></div>
                 <div class="separator long"></div>
                 <div class="group">
@@ -212,6 +214,7 @@
                         <div class="btn-slot text"  id="animation-trigger"></div>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small">
                     <div class="elset font-normal">
                         <span class="btn-slot text" id="animation-duration"></span>
@@ -222,6 +225,7 @@
                         <span id="animation-spin-delay" class="btn-slot text spinner" ></span>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small">
                     <div class="elset font-normal">
                         <span class="btn-slot text" id="animation-repeat"></span>
diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template
index a2ca6ae33..7671925c2 100644
--- a/apps/spreadsheeteditor/main/app/template/Toolbar.template
+++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template
@@ -124,6 +124,7 @@
                         <span class="btn-slot split" id="slot-btn-table-tpl"></span>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 168px;width: 100%;" data-group-width="100%"></div>
             </section>
             <section class="panel" data-tab="ins">
diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js
index 9513fd36b..f5c4396be 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotTable.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js
@@ -79,6 +79,7 @@ define([
                         '<span class="btn-slot text" id="slot-chk-header-column"></span>' +
                     '</div>' +
                 '</div>' +
+                '<div class="separator long invisible"></div>' +
                 '<div class="group small">' +
                     '<div class="elset">' +
                         '<span class="btn-slot text" id="slot-chk-banded-row"></span>' +
@@ -87,6 +88,7 @@ define([
                         '<span class="btn-slot text" id="slot-chk-banded-column"></span>' +
                     '</div>' +
                 '</div>' +
+                '<div class="separator long invisible"></div>' +
                 '<div class="group flex small" id="slot-field-pivot-styles" style="width: 324px;max-width: 324px;min-width: 105px;" data-group-width="324px">' +
                 '</div>' +
             '</section>';
diff --git a/apps/spreadsheeteditor/main/app/view/WBProtection.js b/apps/spreadsheeteditor/main/app/view/WBProtection.js
index de163aff6..8f9e7efed 100644
--- a/apps/spreadsheeteditor/main/app/view/WBProtection.js
+++ b/apps/spreadsheeteditor/main/app/view/WBProtection.js
@@ -53,6 +53,7 @@ define([
                 '<span id="slot-btn-protect-sheet" class="btn-slot text x-huge" style="margin-right: 2px;"></span>' +
                 '<span id="slot-btn-allow-ranges" class="btn-slot text x-huge"></span>' +
             '</div>' +
+            '<div class="separator long invisible"></div>' +
             '<div class="group small">' +
                 '<div class="elset">' +
                     '<span class="btn-slot text" id="slot-chk-locked-cell"></span>' +
@@ -61,6 +62,7 @@ define([
                     '<span class="btn-slot text" id="slot-chk-hidden-formula"></span>' +
                 '</div>' +
             '</div>' +
+            '<div class="separator long invisible"></div>' +
             '<div class="group small">' +
                 '<div class="elset">' +
                     '<span class="btn-slot text" id="slot-chk-locked-shape"></span>' +

From e5b70314957e6848af05a4a2a6ebc63bd155b3f2 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 13 Jul 2022 21:35:11 +0300
Subject: [PATCH 5/7] Fix Bug 57974

---
 apps/common/main/resources/less/toolbar.less  |  2 +-
 apps/documenteditor/main/app/view/Toolbar.js  | 10 +++++--
 .../main/app/view/Toolbar.js                  | 10 +++++--
 .../main/app/view/PivotTable.js               | 29 ++++++++++++++-----
 .../main/app/view/Toolbar.js                  | 10 +++++--
 5 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 23cf89c5b..f0a9cf0d9 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -214,7 +214,7 @@
         padding: 12px 10px 7px 0;
         border-radius: 0;
         z-index:999;
-        overflow: hidden;
+        overflow: auto;
         .compactwidth {
             .btn-group, .btn-toolbar {
                 &.x-huge {
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 4fc5381db..a294b8338 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1515,11 +1515,17 @@ define([
                                 menu.menuAlignEl = cmp.cmpEl;
 
                                 menu.menuAlign = 'tl-tl';
-                                var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - columnCount * (itemMargin + _width) - 1;
+                                var menuWidth = columnCount * (itemMargin + _width),
+                                    buttonOffsetLeft = cmp.openButton.$el.offset().left;
+                                // if (menuWidth>buttonOffsetLeft)
+                                //     menuWidth = Math.max(Math.floor(buttonOffsetLeft/(itemMargin + _width)), 2) * (itemMargin + _width);
+                                if (menuWidth>Common.Utils.innerWidth())
+                                    menuWidth = Math.max(Math.floor(Common.Utils.innerWidth()/(itemMargin + _width)), 2) * (itemMargin + _width);
+                                var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1;
                                 menu.setOffset(Math.min(offset, 0));
 
                                 menu.cmpEl.css({
-                                    'width': columnCount * (_width + itemMargin),
+                                    'width': menuWidth,
                                     'min-height': cmp.cmpEl.height()
                                 });
                             }
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index de669b96c..41ff4c21f 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1088,11 +1088,17 @@ define([
                                 menu.menuAlignEl = cmp.cmpEl;
 
                                 menu.menuAlign = 'tl-tl';
-                                var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - columnCount * (itemMargin + itemWidth) - 1;
+                                var menuWidth = columnCount * (itemMargin + itemWidth),
+                                    buttonOffsetLeft = cmp.openButton.$el.offset().left;
+                                // if (menuWidth>buttonOffsetLeft)
+                                //     menuWidth = Math.max(Math.floor(buttonOffsetLeft/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth);
+                                if (menuWidth>Common.Utils.innerWidth())
+                                    menuWidth = Math.max(Math.floor(Common.Utils.innerWidth()/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth);
+                                var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1;
                                 menu.setOffset(Math.min(offset, 0));
 
                                 menu.cmpEl.css({
-                                    'width': columnCount * (itemWidth + itemMargin),
+                                    'width': menuWidth,
                                     'min-height': cmp.cmpEl.height()
                                 });
                             }
diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js
index f5c4396be..94d66261a 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotTable.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js
@@ -79,7 +79,6 @@ define([
                         '<span class="btn-slot text" id="slot-chk-header-column"></span>' +
                     '</div>' +
                 '</div>' +
-                '<div class="separator long invisible"></div>' +
                 '<div class="group small">' +
                     '<div class="elset">' +
                         '<span class="btn-slot text" id="slot-chk-banded-row"></span>' +
@@ -88,7 +87,6 @@ define([
                         '<span class="btn-slot text" id="slot-chk-banded-column"></span>' +
                     '</div>' +
                 '</div>' +
-                '<div class="separator long invisible"></div>' +
                 '<div class="group flex small" id="slot-field-pivot-styles" style="width: 324px;max-width: 324px;min-width: 105px;" data-group-width="324px">' +
                 '</div>' +
             '</section>';
@@ -281,10 +279,29 @@ define([
                     lock        : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set['FormatCells'], _set['PivotTables']],
                     beforeOpenHandler: function(e) {
                         var cmp = this,
-                            menu = cmp.openButton.menu;
+                            menu = cmp.openButton.menu,
+                            columnCount = 4;
+
                         if (menu.cmpEl) {
-                            var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menu.cmpEl.outerWidth() - 1;
+                            var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
+                            var itemMargin = 8;
+                            var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) :
+                                (cmp.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) +
+                                parseFloat(itemEl.css('border-left-width')) + parseFloat(itemEl.css('border-right-width')));
+
+                            menu.menuAlignEl = cmp.cmpEl;
+                            menu.menuAlign = 'tl-tl';
+                            var menuWidth = columnCount * (itemMargin + itemWidth) + 17, // for scroller
+                                buttonOffsetLeft = cmp.openButton.$el.offset().left;
+                            if (menuWidth>Common.Utils.innerWidth())
+                                menuWidth = Math.max(Math.floor((Common.Utils.innerWidth()-17)/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth) + 17;
+                            var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1;
                             menu.setOffset(Math.min(offset, 0));
+
+                            menu.cmpEl.css({
+                                'width': menuWidth,
+                                'min-height': cmp.cmpEl.height()
+                            });
                         }
                     },
                     dataHint: '1',
@@ -375,10 +392,6 @@ define([
                 this.btnPivotSubtotals.render(this.$el.find('#slot-btn-pivot-subtotals'));
                 this.btnPivotGrandTotals.render(this.$el.find('#slot-btn-pivot-grand-totals'));
                 this.pivotStyles.render(this.$el.find('#slot-field-pivot-styles'));
-                this.pivotStyles.openButton.menu.cmpEl.css({
-                    'min-width': 293,
-                    'max-width': 293
-                });
 
                 return this.$el;
             },
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index c527f6721..429ef8dea 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1330,11 +1330,17 @@ define([
                             menu.menuAlignEl = cmp.cmpEl;
 
                             menu.menuAlign = 'tl-tl';
-                            var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - columnCount * (itemMargin + itemWidth) - 1;
+                            var menuWidth = columnCount * (itemMargin + itemWidth),
+                                buttonOffsetLeft = cmp.openButton.$el.offset().left;
+                            // if (menuWidth>buttonOffsetLeft)
+                            //     menuWidth = Math.max(Math.floor(buttonOffsetLeft/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth);
+                            if (menuWidth>Common.Utils.innerWidth())
+                                menuWidth = Math.max(Math.floor(Common.Utils.innerWidth()/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth);
+                            var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1;
                             menu.setOffset(Math.min(offset, 0));
 
                             menu.cmpEl.css({
-                                'width' : columnCount * (itemWidth + itemMargin),
+                                'width': menuWidth,
                                 'min-height': cmp.cmpEl.height()
                             });
                         }

From ab3bb5a4e36d4fd4a303d8e2239bd8043ef2fdd2 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Wed, 13 Jul 2022 22:47:33 +0300
Subject: [PATCH 6/7] Refactoring "more" section

---
 apps/common/main/resources/less/toolbar.less       | 10 ++++++++++
 apps/spreadsheeteditor/main/app/view/PivotTable.js |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index f0a9cf0d9..a3b26b0c1 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -232,8 +232,18 @@
                 }
             }
         }
+        .group {
+            height: 52px !important;
+        }
         &[data-tab=pivot] {
             padding: 5px 10px 0 0;
+            .group {
+                height: 60px !important;
+            }
+            .separator {
+                margin-top: 4px;
+                margin-bottom: 4px;
+            }
         }
     }
 
diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js
index 94d66261a..8a679fa8f 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotTable.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js
@@ -79,6 +79,7 @@ define([
                         '<span class="btn-slot text" id="slot-chk-header-column"></span>' +
                     '</div>' +
                 '</div>' +
+                '<div class="separator long invisible"></div>' +
                 '<div class="group small">' +
                     '<div class="elset">' +
                         '<span class="btn-slot text" id="slot-chk-banded-row"></span>' +
@@ -87,6 +88,7 @@ define([
                         '<span class="btn-slot text" id="slot-chk-banded-column"></span>' +
                     '</div>' +
                 '</div>' +
+                '<div class="separator long invisible"></div>' +
                 '<div class="group flex small" id="slot-field-pivot-styles" style="width: 324px;max-width: 324px;min-width: 105px;" data-group-width="324px">' +
                 '</div>' +
             '</section>';

From b680a27c2efe6cf9c331db2934d6b36a9266beee Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 14 Jul 2022 00:03:57 +0300
Subject: [PATCH 7/7] Fix more section for plugins panel

---
 apps/common/main/lib/controller/Plugins.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index 05775c87a..ba115f40d 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -242,6 +242,10 @@ define([
                         $('<div class="separator long"></div>').appendTo(me.$toolbarPanelPlugins);
                         _group = $('<div class="group"></div>');
                         rank_plugins = 0;
+                    } else {
+                        _group.appendTo(me.$toolbarPanelPlugins);
+                        $('<div class="separator long invisible"></div>').appendTo(me.$toolbarPanelPlugins);
+                        _group = $('<div class="group" style="padding-left: 0;"></div>');
                     }
 
                     var btn = me.panelPlugins.createPluginButton(model);