Await for confirm method results (#525)

hotwired · May 1, 2022 · 933419b · 933419b
1 parent 43f9044
commit 933419b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/core/drive/form_submission.ts b/src/core/drive/form_submission.ts
@@ -51,8 +51,8 @@ export class FormSubmission {
   state = FormSubmissionState.initialized
   result?: FormSubmissionResult
 
-  static confirmMethod(message: string, _element: HTMLFormElement): boolean {
-    return confirm(message)
+  static confirmMethod(message: string, _element: HTMLFormElement): Promise<boolean> {
+    return Promise.resolve(confirm(message))
   }
 
   constructor(
@@ -121,7 +121,7 @@ export class FormSubmission {
     const { initialized, requesting } = FormSubmissionState
 
     if (this.needsConfirmation) {
-      const answer = FormSubmission.confirmMethod(this.confirmationMessage!, this.formElement)
+      const answer = await FormSubmission.confirmMethod(this.confirmationMessage!, this.formElement)
       if (!answer) {
         return
       }

diff --git a/src/core/index.ts b/src/core/index.ts
@@ -99,6 +99,6 @@ export function setProgressBarDelay(delay: number) {
   session.setProgressBarDelay(delay)
 }
 
-export function setConfirmMethod(confirmMethod: (message: string, element: HTMLFormElement) => boolean) {
+export function setConfirmMethod(confirmMethod: (message: string, element: HTMLFormElement) => Promise<boolean>) {
   FormSubmission.confirmMethod = confirmMethod
 }
diff --git a/src/tests/functional/form_submission_tests.ts b/src/tests/functional/form_submission_tests.ts
@@ -57,7 +57,7 @@ export class FormSubmissionTests extends TurboDriveTestCase {
   }
 
   async "test from submission with confirmation overriden"() {
-    await this.remote.execute(() => window.Turbo.setConfirmMethod(() => confirm("Overriden message")))
+    await this.remote.execute(() => window.Turbo.setConfirmMethod(() => Promise.resolve(confirm("Overriden message"))))
 
     await this.clickSelector("#standard form.confirm input[type=submit]")