EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3950 core: Fix prevent opening modal twice when suddenly closed

main
Pau Ferrer Ocaña 2021-12-15 12:04:48 +01:00
parent 2ae55d04fb
commit c9f464e756
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/services/utils/dom.ts
View File

@ -1703,6 +1703,9 @@ export class CoreDomUtilsProvider {
let navSubscription: Subscription | undefined; let navSubscription: Subscription | undefined;
// Get the promise before presenting to get result if modal is suddenly hidden.
const resultPromise = waitForDismissCompleted ? modal.onDidDismiss<T>() : modal.onWillDismiss<T>();
if (!this.displayedModals[modalId]) { if (!this.displayedModals[modalId]) {
// Store the modal and remove it when dismissed. // Store the modal and remove it when dismissed.
this.displayedModals[modalId] = modal; this.displayedModals[modalId] = modal;
@ -1719,7 +1722,8 @@ export class CoreDomUtilsProvider {
await modal.present(); await modal.present();
} }
const result = waitForDismissCompleted ? await modal.onDidDismiss<T>() : await modal.onWillDismiss<T>(); const result = await resultPromise;
navSubscription?.unsubscribe(); navSubscription?.unsubscribe();
delete this.displayedModals[modalId]; delete this.displayedModals[modalId];