From c738f330551dff8f7889363c93ff76ddc0cf3d36 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Sun, 4 Jul 2021 15:40:17 +0300
Subject: [PATCH] [DE] FIx Bug 51065

---
 apps/common/main/resources/less/toolbar.less    |  6 ++++++
 .../main/app/controller/Toolbar.js              | 17 ++++++++++++++---
 apps/documenteditor/main/app/view/FormsTab.js   |  4 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 1efe12759..f7571b713 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -224,6 +224,12 @@
                 margin-left: 10px;
             }
         }
+
+        &.no-group-mask {
+            .elset {
+                position: relative;
+            }
+        }
     }
 
     .elset {
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index a48fe02ad..efa107fc5 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -3051,9 +3051,11 @@ define([
             var toolbar = this.toolbar;
             if(disable) {
                 if (reviewmode) {
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review)'));
+                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review):not(.no-group-mask.inner-elset)'));
+                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset'));
                 } else if (fillformmode) {
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.form-view)'));
+                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.form-view):not(.no-group-mask.inner-elset)'));
+                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset:not(.no-group-mask.form-view)'));
                 } else
                     mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
             } else {
@@ -3061,10 +3063,19 @@ define([
             }
             $('.no-group-mask').each(function(index, item){
                 var $el = $(item);
-                if ($el.find('.toolbar-group-mask').length>0)
+                if ($el.find('> .toolbar-group-mask').length>0)
                     $el.css('opacity', 0.4);
                 else {
                     $el.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
+                    $el.find('.elset').each(function(index, elitem){
+                        var $elset = $(elitem);
+                        if ($elset.find('> .toolbar-group-mask').length>0) {
+                            $elset.css('opacity', 0.4);
+                        } else {
+                            $elset.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
+                        }
+                        $el.css('opacity', 1);
+                    });
                 }
             });
 
diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js
index 2437a1451..ffe9c70a3 100644
--- a/apps/documenteditor/main/app/view/FormsTab.js
+++ b/apps/documenteditor/main/app/view/FormsTab.js
@@ -58,8 +58,8 @@ define([
                 '<span class="btn-slot text x-huge" id="slot-btn-form-image"></span>' +
             '</div>' +
             '<div class="separator long forms" style="display: none;"></div>' +
-            '<div class="group no-group-mask form-view small" style="display: none;">' +
-                '<div class="elset">' +
+            '<div class="group no-group-mask inner-elset small" style="display: none;">' +
+                '<div class="elset no-group-mask form-view">' +
                     '<span class="btn-slot text" id="slot-form-clear-fields"></span>' +
                 '</div>' +
                 '<div class="elset">' +