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

nolimits4web · nolimits4web · commit 99f026712fe3 · 2022-10-31T12:40:42.000+03:00
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);
         }
       });
     });

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class Modal extends Framework7Class {`
`77`	`77`	modal.emit(`local::closed modalClosed ${modal.type}Closed`, modal);
`78`	`78`	`}`
`79`	`79`
`80`		`- open(animateModal) {`
	`80`	`+ open(animateModal, force) {`
`81`	`81`	`const modal = this;`
`82`	`82`	`const document = getDocument();`
`83`	`83`	`const app = modal.app;`
`@@ -94,7 +94,7 @@ class Modal extends Framework7Class {`
`94`	`94`	`if (animateModal === false && $el[0] && type !== 'dialog') {`
`95`	`95`	`$el[0].style.display = 'block';`
`96`	`96`	`}`
`97`		`- return modal;`
	`97`	`+ if (!force) return modal;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (type === 'dialog' && app.params.modal.queueDialogs) {`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ const Popup = forwardRef((props, ref) => {`
`139`	`139`	`f7Popup.current = f7.popup.create(popupParams);`
`140`	`140`	`modalEvents('on');`
`141`	`141`	`if (opened) {`
`142`		`- f7Popup.current.open(false);`
	`142`	`+ f7Popup.current.open(false, true);`
`143`	`143`	`}`
`144`	`144`	`});`
`145`	`145`	`};`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`f7ready(() => {`
`126`	`126`	`f7Popup = app.f7.popup.create(popupParams);`
`127`	`127`	`if (opened) {`
`128`		`- f7Popup.open(false);`
	`128`	`+ f7Popup.open(false, true);`
`129`	`129`	`}`
`130`	`130`	`});`
`131`	`131`	`});`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ export default {`
`151`	`151`	`f7ready(() => {`
`152`	`152`	`f7Popup.value = f7.popup.create(popupParams);`
`153`	`153`	`if (props.opened) {`
`154`		`- f7Popup.value.open(false);`
	`154`	`+ f7Popup.value.open(false, true);`
`155`	`155`	`}`
`156`	`156`	`});`
`157`	`157`	`});`