From f4dc72969689dcfd1fef5d71b138b432e1238707 Mon Sep 17 00:00:00 2001 From: codewithvk Date: Thu, 4 Jan 2024 19:52:24 +0530 Subject: [PATCH] Mobile: Resolve issue where busy popup covers the whole document Fixes a bug in the mobile version where the busy popup was erroneously covering the entire document. Adjusted the styling to ensure proper display and user experience. Signed-off-by: codewithvk Change-Id: I6b3b9900b3f0891f36aacac3e7ab9013d4e93690 --- browser/css/device-mobile.css | 10 +++++++--- browser/src/control/Control.MobileWizardWindow.js | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/browser/css/device-mobile.css b/browser/css/device-mobile.css index f06d169e5..0006bd517 100644 --- a/browser/css/device-mobile.css +++ b/browser/css/device-mobile.css @@ -679,15 +679,19 @@ td[id^='tb_spreadsheet-toolbar_item']:focus table.w2ui-button div.w2ui-icon, td[ } /* busy popup */ - -#mobile-wizard.popup:not(.snackbar) { +#mobile-wizard.popup:not(.snackbar):not(.busypopup) { position: fixed; top: 0; left: 0; height: 100vh !important; } +#mobile-wizard.busypopup { + border-radius: 16px 16px 0 0; +} #mobile-wizard.popup #mobile-wizard-content, -#mobile-wizard.popup .mobile-wizard-content { +#mobile-wizard.snackbar .mobile-wizard-content, +#mobile-wizard.busypopup #mobile-wizard-content, +#mobile-wizard.busypopup .mobile-wizard-content { display: flex; align-items: start; justify-content: center; diff --git a/browser/src/control/Control.MobileWizardWindow.js b/browser/src/control/Control.MobileWizardWindow.js index ea74412c3..586c1f198 100644 --- a/browser/src/control/Control.MobileWizardWindow.js +++ b/browser/src/control/Control.MobileWizardWindow.js @@ -40,6 +40,7 @@ L.Control.MobileWizardWindow = L.Control.extend({ this.isVisible = false; // indicates if this window is currently visible inside mobile-wizard this.isPopup = false; // indicates that current window is a popup, uses different look this.isSnackBar = false; // shows as little popup at the bottom + this.isBusyPopUp = false; // show a busy popup this.isFunctionMenu = false; // shows full screen with list of calc functions this.isHamburgerMenu = false; // shows full screen with items from menubar this.isShapesWizard = false; // shows full screen shape type selector @@ -79,6 +80,7 @@ L.Control.MobileWizardWindow = L.Control.extend({ this.mobileWizard.removeClass('funcwizard'); this.mobileWizard.removeClass('popup'); this.mobileWizard.removeClass('snackbar'); + this.mobileWizard.removeClass('busypopup'); }, /// this applies special styling for different types of mobile-wizards @@ -93,6 +95,8 @@ L.Control.MobileWizardWindow = L.Control.extend({ this.mobileWizard.addClass('popup'); if (this.isSnackBar) this.mobileWizard.addClass('snackbar'); + if (this.isBusyPopUp) + this.mobileWizard.addClass('busypopup'); }, /// resets all classes which can modify the look to the original values @@ -567,6 +571,10 @@ L.Control.MobileWizardWindow = L.Control.extend({ this.isSnackBar = true; this.snackBarTimout = setTimeout(function () { that.parent.removeWindow(that); }, data.timeout ? data.timeout : this.options.snackbarTimeout); } + else if (data.id === 'busypopup') { + var that = this; + this.isBusyPopUp = true; + } } this._applySpecialClasses();