From 0f5853140332b54cca8ae95ba141e88e1c6a5330 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Fri, 13 Aug 2021 14:10:10 +0300
Subject: [PATCH] Fix bug 51932

---
 apps/common/main/lib/component/ComboDataView.js     | 7 ++++---
 apps/common/main/resources/less/combo-dataview.less | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js
index 25f912a47..d2897058d 100644
--- a/apps/common/main/lib/component/ComboDataView.js
+++ b/apps/common/main/lib/component/ComboDataView.js
@@ -235,9 +235,10 @@ define([
         onResize: function() {
             if (this.openButton) {
                 var button = $('button', this.openButton.cmpEl);
-                button && button.css({
-                    width : $('.button', this.cmpEl).width(),
-                    height: $('.button', this.cmpEl).height()
+                var cntButton = $('.button', this.cmpEl);
+                button && cntButton.width() > 0 && button.css({
+                    width : cntButton.width(),
+                    height: cntButton.height()
                 });
 
                 this.openButton.menu.hide();
diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less
index 11a8aff52..47c8a101a 100644
--- a/apps/common/main/resources/less/combo-dataview.less
+++ b/apps/common/main/resources/less/combo-dataview.less
@@ -164,6 +164,11 @@
         width: @combo-dataview-button-width;
         height: @combo-dataview-height;
 
+        .btn-group, button {
+            width: 100%;
+            height: 100%;
+        }
+
         button {
             &.dropdown-toggle {
                 padding: 0;