Close #1953 add promise support to dialog

buefy · Jul 31, 2020 · 9d45c6a · 9d45c6a
1 parent 44a5857
commit 9d45c6a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
@@ -204,6 +204,7 @@ export default {
                     return
                 }
             }
+            this.$emit('confirm', this.prompt)
             this.onConfirm(this.prompt, this)
             if (this.closeOnConfirm) this.close()
         },

diff --git a/src/components/dialog/index.js b/src/components/dialog/index.js
@@ -1,28 +1,26 @@
 import Dialog from './Dialog'
 
-import { VueInstance } from '../../utils/config'
+import config, { VueInstance } from '../../utils/config'
 import { merge } from '../../utils/helpers'
 import { use, registerComponent, registerComponentProgrammatic } from '../../utils/plugins'
 
 let localVueInstance
 
-function open(defaultParam, params) {
-    let slot
-    if (Array.isArray(params.message)) {
-        slot = params.message
-        delete params.message
-    }
-    const propsData = merge(defaultParam, params)
+function open(propsData) {
     const vm = typeof window !== 'undefined' && window.Vue ? window.Vue : localVueInstance || VueInstance
     const DialogComponent = vm.extend(Dialog)
-    const instance = new DialogComponent({
+    const component = new DialogComponent({
         el: document.createElement('div'),
         propsData
     })
-    if (slot) {
-        instance.$slots.default = slot
+    if (!config.defaultProgrammaticPromise) {
+        return component
+    } else {
+        return new Promise((resolve) => {
+            component.$on('confirm', (event) => resolve({ result: event || true, dialog: component }))
+            component.$on('cancel', () => resolve({ result: false, dialog: component }))
+        })
     }
-    return instance
 }
 
 const DialogProgrammatic = {
@@ -35,18 +33,21 @@ const DialogProgrammatic = {
         const defaultParam = {
             canCancel: false
         }
-        return open(defaultParam, params)
+        const propsData = merge(defaultParam, params)
+        return open(propsData)
     },
     confirm(params) {
         const defaultParam = {}
-        return open(defaultParam, params)
+        const propsData = merge(defaultParam, params)
+        return open(propsData)
     },
     prompt(params) {
         const defaultParam = {
             hasInput: true,
             confirmText: 'Done'
         }
-        return open(defaultParam, params)
+        const propsData = merge(defaultParam, params)
+        return open(propsData)
     }
 }
 

diff --git a/src/components/modal/Modal.vue b/src/components/modal/Modal.vue
@@ -197,7 +197,7 @@ export default {
         */
         cancel(method) {
             if (this.cancelOptions.indexOf(method) < 0) return
-
+            this.$emit('cancel', arguments)
             this.onCancel.apply(null, arguments)
             this.close()
         },

diff --git a/src/utils/config.js b/src/utils/config.js
@@ -47,6 +47,7 @@ let config = {
     defaultTabsAnimated: true,
     defaultTabsType: null,
     defaultStatusIcon: true,
+    defaultProgrammaticPromise: false,
     defaultLinkTags: [
         'a',
         'button',