From 74e62f003d8e82cb2c284073ecdf798ff4a45d9a Mon Sep 17 00:00:00 2001
From: "Julia.Svinareva" <julia.svinaryova@onlyoffice.com>
Date: Sun, 26 Nov 2023 01:48:51 +0300
Subject: [PATCH] [DE PE SSE] Fix bug 65228

---
 apps/common/main/lib/component/SideMenu.js    | 19 +++++++++++++++++++
 .../main/app/controller/LeftMenu.js           |  2 +-
 apps/documenteditor/main/app/view/LeftMenu.js |  1 +
 .../pdfeditor/main/app/controller/LeftMenu.js |  3 +--
 apps/pdfeditor/main/app/view/LeftMenu.js      |  1 +
 .../main/app/controller/LeftMenu.js           |  2 +-
 .../main/app/view/LeftMenu.js                 |  1 +
 .../main/app/controller/LeftMenu.js           |  2 +-
 .../main/app/view/LeftMenu.js                 |  1 +
 9 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/component/SideMenu.js b/apps/common/main/lib/component/SideMenu.js
index 76ccaf2dec..835f4f3855 100644
--- a/apps/common/main/lib/component/SideMenu.js
+++ b/apps/common/main/lib/component/SideMenu.js
@@ -245,6 +245,25 @@ define([
 
                 this.setMoreButton();
             },
+
+            isPluginButtonPressed: function () {
+                var pressed = false;
+                for (var i=0; i<this.buttons.length; i++) {
+                    if (this.buttons[i].options.type === 'plugin' && this.buttons[i].pressed) {
+                        pressed = true;
+                        break;
+                    }
+                }
+                return pressed;
+            },
+
+            togglePluginButtons: function (toggle) {
+                for (var i=0; i<this.buttons.length; i++) {
+                    if (this.buttons[i].options.type === 'plugin' && this.buttons[i].pressed) {
+                        this.buttons[i].toggle(toggle, true);
+                    }
+                }
+            },
         }
     }()));
 });
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index b709a2fabe..384431a3d2 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -847,7 +847,7 @@ define([
                             return false;
                         }
                     }
-                    if (this.leftMenu.btnAbout.pressed || $(e.target).parents('#left-menu').length ) {
+                    if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
                         if (!Common.UI.HintManager.isHintVisible()) {
                             this.leftMenu.close();
                             Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index b926360af0..4c118835bc 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -320,6 +320,7 @@ define([
                     this.panelThumbnails['hide']();
                     this.btnThumbnails.toggle(false, true);
                 }
+                this.togglePluginButtons(false);
             }
         },
 
diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js
index e01776f2d6..845565e3cf 100644
--- a/apps/pdfeditor/main/app/controller/LeftMenu.js
+++ b/apps/pdfeditor/main/app/controller/LeftMenu.js
@@ -769,8 +769,7 @@ define([
                             return false;
                         }
                     }
-                    if (this.leftMenu.btnAbout.pressed || this.leftMenu.btnPlugins.pressed ||
-                                $(e.target).parents('#left-menu').length ) {
+                    if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
                         if (!Common.UI.HintManager.isHintVisible()) {
                             this.leftMenu.close();
                             Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
diff --git a/apps/pdfeditor/main/app/view/LeftMenu.js b/apps/pdfeditor/main/app/view/LeftMenu.js
index 32b7e10399..21f545e52e 100644
--- a/apps/pdfeditor/main/app/view/LeftMenu.js
+++ b/apps/pdfeditor/main/app/view/LeftMenu.js
@@ -316,6 +316,7 @@ define([
                     this.panelThumbnails['hide']();
                     this.btnThumbnails.toggle(false, true);
                 }
+                this.togglePluginButtons(false);
             }
         },
 
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 8025102d9d..59d99e7f70 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -675,7 +675,7 @@ define([
                         }
                     }
 
-                    if ( this.leftMenu.btnAbout.pressed || $(e.target).parents('#left-menu').length ) {
+                    if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
                         if (!Common.UI.HintManager.isHintVisible()) {
                             this.leftMenu.close();
                             Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js
index 069c45ee73..b897e3f57a 100644
--- a/apps/presentationeditor/main/app/view/LeftMenu.js
+++ b/apps/presentationeditor/main/app/view/LeftMenu.js
@@ -289,6 +289,7 @@ define([
                 this.btnSearchBar.toggle(false, true);
             }
             this.fireEvent('panel:show', [this, '', false]);
+            this.togglePluginButtons(false);
         },
 
         isOpened: function() {
diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
index 10810f4c00..9e1c6cb90b 100644
--- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -831,7 +831,7 @@ define([
                             return false;
                         }
                     }
-                    if ( this.leftMenu.btnAbout.pressed ||
+                    if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() ||
                         ($(e.target).parents('#left-menu').length || this.leftMenu.btnComments.pressed) && this.api.isCellEdited!==true) {
                         if (!Common.UI.HintManager.isHintVisible()) {
                             this.leftMenu.close();
diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
index 0c9f786148..86eef6b080 100644
--- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js
+++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js
@@ -273,6 +273,7 @@ define([
                 this.panelSearch['hide']();
                 this.btnSearchBar.toggle(false, true);
             }
+            this.togglePluginButtons(false);
         },
 
         isOpened: function() {