[BugFix] Properly trigger onClose hook in dialogService (#2655)

browser_tests/extensionAPI.spec.ts

@@ -280,5 +280,22 @@ test.describe('Topbar commands', () => {
       await comfyPage.confirmDialog.click('confirm')
       expect(await comfyPage.page.evaluate(() => window['value'])).toBe(true)
     })
+
+    test('Should allow dismissing a dialog', async ({ comfyPage }) => {
+      await comfyPage.page.evaluate(() => {
+        window['value'] = 'foo'
+        window['app'].extensionManager.dialog
+          .confirm({
+            title: 'Test Confirm',
+            message: 'Test Confirm Message'
+          })
+          .then((value: boolean) => {
+            window['value'] = value
+          })
+      })
+
+      await comfyPage.confirmDialog.click('reject')
+      expect(await comfyPage.page.evaluate(() => window['value'])).toBeNull()
+    })
   })
 })

src/stores/dialogStore.ts

@@ -43,18 +43,13 @@ export const useDialogStore = defineStore('dialog', () => {
   }
 
   function closeDialog(options?: { key: string }) {
-    if (!options) {
+    const targetDialog = options
-      dialogStack.value.pop()
+      ? dialogStack.value.find((d) => d.key === options.key)
-      return
+      : dialogStack.value[0]
-    }
+    if (!targetDialog) return
 
-    const dialogKey = options.key
+    targetDialog.dialogComponentProps?.onClose?.()
-
+    dialogStack.value.splice(dialogStack.value.indexOf(targetDialog), 1)
-    const index = dialogStack.value.findIndex((d) => d.key === dialogKey)
-    if (index === -1) {
-      return
-    }
-    dialogStack.value.splice(index, 1)
   }
 
   function createDialog(options: {
@@ -93,7 +88,6 @@ export const useDialogStore = defineStore('dialog', () => {
           dialog.dialogComponentProps.maximized = false
         },
         onAfterHide: () => {
-          options.dialogComponentProps?.onClose?.()
           closeDialog(dialog)
         },
         pt: {