Allow dialog and action-sheet plugins to receive a resolver token

quasarframework · Jun 8, 2018 · 66d6ca1 · 66d6ca1
1 parent 075fe7e
commit 66d6ca1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/dev/components/global/dialog.vue b/dev/components/global/dialog.vue
@@ -41,6 +41,8 @@
       <q-btn label="Toggle ref" @click="toggle" />
       <q-btn label="Toggle model" @click="toggle2" />
       <q-btn label="Prompt" @click="adHoc" />
+      <q-btn label="Prompt - autoresolve in 3sec" @click="adHoc(3000, 'Autocompleted')" />
+      <q-btn label="Prompt - autoreject in 3sec" @click="adHoc(3000)" />
       <q-btn label="Options" @click="adHoc2" />
       <q-btn label="Confirm" @click="adHoc3" />
       <q-btn label="Method" @click="asMethod" />
@@ -90,7 +92,13 @@ export default {
         Promise.resolve(okFn()).then(() => this.$q.notify(`Ok ${this.name}, going with ${hero}`))
       }
     },
-    adHoc () {
+    adHoc (autoclose, autoResolve) {
+      const resolver = autoclose > 0
+        ? new Promise((resolve, reject) => {
+          setTimeout(() => autoResolve ? resolve(autoResolve) : reject(new Error('Autoclosed')), autoclose)
+        })
+        : undefined
+
       this.$q.dialog({
         title: 'Prompt',
         message: 'Modern HTML5 Single Page Application front-end framework on steroids.',
@@ -101,10 +109,10 @@ export default {
         cancel: true,
         // preventClose: true,
         color: 'secondary'
-      }).then(data => {
+      }, resolver).then(data => {
         console.log('>>>> OK, received:', data)
-      }).catch(() => {
-        console.log('>>>> Cancel')
+      }).catch(error => {
+        console.log('>>>> Cancel', String(error))
       })
     },
     adHoc2 () {

diff --git a/src/utils/modal-fn.js b/src/utils/modal-fn.js
@@ -1,7 +1,7 @@
 import { isSSR } from '../plugins/platform'
 
 export default function (Component, Vue) {
-  return props => {
+  return (props, resolver) => {
     return new Promise((resolve, reject) => {
       if (isSSR) { return }
 
@@ -21,8 +21,8 @@ export default function (Component, Vue) {
               resolve(data)
               vm.$destroy()
             },
-            cancel: () => {
-              reject(new Error())
+            cancel: reason => {
+              reject(reason || new Error())
               vm.$destroy()
             }
           }
@@ -31,6 +31,15 @@ export default function (Component, Vue) {
           this.$refs.modal.show()
         }
       })
+      if (resolver) {
+        resolver.then(data => {
+          resolve(data)
+          vm.$destroy()
+        }).catch(reason => {
+          reject(reason || new Error())
+          vm.$destroy()
+        })
+      }
     })
   }
 }