feat(core): modal.open accepts second force argument

framework7io · Oct 31, 2022 · 99f0267 · 99f0267
1 parent 50224e9
commit 99f0267
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/core/components/modal/modal-class.js b/src/core/components/modal/modal-class.js
@@ -77,7 +77,7 @@ class Modal extends Framework7Class {
     modal.emit(`local::closed modalClosed ${modal.type}Closed`, modal);
   }
 
-  open(animateModal) {
+  open(animateModal, force) {
     const modal = this;
     const document = getDocument();
     const app = modal.app;
@@ -94,7 +94,7 @@ class Modal extends Framework7Class {
       if (animateModal === false && $el[0] && type !== 'dialog') {
         $el[0].style.display = 'block';
       }
-      return modal;
+      if (!force) return modal;
     }
 
     if (type === 'dialog' && app.params.modal.queueDialogs) {

diff --git a/src/react/components/popup.jsx b/src/react/components/popup.jsx
@@ -139,7 +139,7 @@ const Popup = forwardRef((props, ref) => {
       f7Popup.current = f7.popup.create(popupParams);
       modalEvents('on');
       if (opened) {
-        f7Popup.current.open(false);
+        f7Popup.current.open(false, true);
       }
     });
   };

diff --git a/src/svelte/components/popup.svelte b/src/svelte/components/popup.svelte
@@ -125,7 +125,7 @@
     f7ready(() => {
       f7Popup = app.f7.popup.create(popupParams);
       if (opened) {
-        f7Popup.open(false);
+        f7Popup.open(false, true);
       }
     });
   });

diff --git a/src/vue/components/popup.vue b/src/vue/components/popup.vue
@@ -151,7 +151,7 @@ export default {
       f7ready(() => {
         f7Popup.value = f7.popup.create(popupParams);
         if (props.opened) {
-          f7Popup.value.open(false);
+          f7Popup.value.open(false, true);
         }
       });
     });