From cf2ff32462c0e9a3f6b8abad99c68a0cf151e016 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Tue, 29 Jun 2021 18:38:04 +0300
Subject: [PATCH] Correct dialog window

---
 .../mobile/src/controller/add/AddFilter.jsx          |  9 ++++++---
 apps/spreadsheeteditor/mobile/src/less/app.less      | 12 ------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx
index 917e46388..634b8d32d 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx
@@ -44,6 +44,9 @@ class AddFilterController extends Component {
         const { t } = this.props;
         const _t = t('View.Add', {returnObjects: true});
 
+        f7.popup.close('.add-popup');
+        f7.popover.close('#add-popover');
+        
         let typeCheck = type == 'down' ? Asc.c_oAscSortOptions.Ascending : Asc.c_oAscSortOptions.Descending;
             if( api.asc_sortCellsRangeExpand()) {
                 f7.dialog.create({
@@ -52,23 +55,23 @@ class AddFilterController extends Component {
                     buttons: [
                         {
                             text: _t.txtExpand,
+                            bold: true,
                             onClick: () => {
                                 api.asc_sortColFilter(typeCheck, '', undefined, undefined, true);
-                                f7.popup.close('.add-popup');
                             }
                         },
                         {
                             text: _t.txtSortSelected,
+                            bold: true,
                                 onClick: () => {
                                     api.asc_sortColFilter(typeCheck, '', undefined, undefined);
-                                    f7.popup.close('.add-popup');
                             }
                         },
                         {
                             text: _t.textCancel
                         }
                     ],
-                    cssClass: 'type-sort'
+                    verticalButtons: true,
                 }).open();
             } else 
                 api.asc_sortColFilter(typeCheck, '', undefined, undefined, api.asc_sortCellsRangeExpand() !== null);
diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less
index 281be641d..a3bcb96d9 100644
--- a/apps/spreadsheeteditor/mobile/src/less/app.less
+++ b/apps/spreadsheeteditor/mobile/src/less/app.less
@@ -84,15 +84,3 @@
         }
     }
 }
-
-.type-sort{
-
-    .dialog-inner{
-        text-align: center;
-    }
-    .dialog-buttons{
-        height: 130px;
-        flex-direction: column;
-        justify-content: space-between;
-    }
-}
\ No newline at end of file