Refactor dialog button callback to use DialogV2 type and update prompt method

Author: DFreds

src/ts/ui/nested-effect-selection-dialog.ts

@@ -23,7 +23,7 @@ async function getNestedEffectSelection(
         },
     );
 
-    const choice = (await DialogV2.wait({
+    const choice = (await DialogV2.prompt({
         id: "nested-effect-selection-dialog",
         window: {
             title: effectData.name,
@@ -36,24 +36,18 @@ async function getNestedEffectSelection(
             return null;
         },
         content,
-        buttons: [
-            {
-                action: "ok",
-                label: "ConvenientEffects.SelectEffect",
-                icon: "fa-solid fa-check",
-                callback: async (
-                    _event: PointerEvent | SubmitEvent,
-                    _button: HTMLButtonElement,
-                    dialog: HTMLDialogElement,
-                ) => {
-                    const htmlChoice = $(dialog)
-                        .find('select[name="effect-choice"]')
-                        .val();
-                    return htmlChoice;
-                },
-                default: true,
+        ok: {
+            action: "ok",
+            label: "ConvenientEffects.SelectEffect",
+            icon: "fa-solid fa-check",
+            callback: async (_event, _button, dialog) => {
+                const htmlChoice = $(dialog.element)
+                    .find('select[name="effect-choice"]')
+                    .val();
+                return htmlChoice;
             },
-        ],
+            default: true,
+        },
     })) as string | undefined;
 
     return nestedEffects.find((nestedEffect) => nestedEffect.name === choice);

types/foundry/client-esm/applications/api/dialog.d.ts

@@ -152,18 +152,15 @@ export interface DialogV2WaitOptions {
 export type DialogV2ButtonCallback = (
     event: PointerEvent | SubmitEvent,
     button: HTMLButtonElement,
-    dialog: HTMLDialogElement,
+    dialog: DialogV2,
 ) => Promise<unknown>;
 
 /**
  * A dialog render handler method.
  * @param event The render event.
  * @param dialog The dialog element.
  */
-export type DialogV2RenderCallback = (
-    event: Event,
-    dialog: HTMLDialogElement,
-) => void;
+export type DialogV2RenderCallback = (event: Event, dialog: DialogV2) => void;
 
 /**
  * @param event The close event