fix: complete the promise when calling showValidationMessage() inside…

… preConfirm (#2409)
sweetalert2 · Feb 21, 2022 · e2384a6 · e2384a6
1 parent 2d37516
commit e2384a6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/cypress/integration/params/preConfirm.spec.js b/cypress/integration/params/preConfirm.spec.js
@@ -89,4 +89,19 @@ describe('preConfirm', () => {
     Swal.clickConfirm()
     expect(Swal.isVisible()).to.be.true
   })
+
+  it('should complete the promise when calling showValidationMessage() inside preConfirm', (done) => {
+    Swal.fire({
+      showCancelButton: true,
+      preConfirm: () => {
+        Swal.showValidationMessage('Now click the cancel button')
+      },
+      didOpen: () => {
+        Swal.clickConfirm()
+      },
+    }).then(() => {
+      done()
+    })
+    Swal.clickCancel()
+  })
 })
diff --git a/src/buttons-handlers.js b/src/buttons-handlers.js
@@ -5,6 +5,7 @@ import { asPromise, capitalizeFirstLetter, error } from './utils/utils.js'
 import { showLoading } from './staticMethods/showLoading.js'
 import { DismissReason } from './utils/DismissReason.js'
 import privateProps from './privateProps.js'
+import { handleAwaitingPromise } from './instanceMethods.js'
 
 export const handleConfirmButtonClick = (instance) => {
   const innerParams = privateProps.innerParams.get(instance)
@@ -86,6 +87,7 @@ const deny = (instance, value) => {
       .then((preDenyValue) => {
         if (preDenyValue === false) {
           instance.hideLoading()
+          handleAwaitingPromise(instance)
         } else {
           instance.closePopup({ isDenied: true, value: typeof preDenyValue === 'undefined' ? value : preDenyValue })
         }
@@ -121,6 +123,7 @@ const confirm = (instance, value) => {
       .then((preConfirmValue) => {
         if (isVisible(getValidationMessage()) || preConfirmValue === false) {
           instance.hideLoading()
+          handleAwaitingPromise(instance)
         } else {
           succeedWith(instance, typeof preConfirmValue === 'undefined' ? value : preConfirmValue)
         }

diff --git a/src/instanceMethods/close.js b/src/instanceMethods/close.js
@@ -105,7 +105,7 @@ export function rejectPromise(error) {
   }
 }
 
-const handleAwaitingPromise = (instance) => {
+export const handleAwaitingPromise = (instance) => {
   if (instance.isAwaitingPromise()) {
     privateProps.awaitingPromise.delete(instance)
     // The instance might have been previously partly destroyed, we must resume the destroy process in this case #2335