Merge pull request #19487 from Snuffleupagus/OverlayManager-closeIfActive

Add a new `closeIfActive` method in the `OverlayManager` class

web/alt_text_manager.js

@@ -245,9 +245,7 @@ class AltTextManager {
   }
 
   #finish() {
-    if (this.#overlayManager.active === this.#dialog) {
+    this.#overlayManager.closeIfActive(this.#dialog);
-      this.#overlayManager.close(this.#dialog);
-    }
   }
 
   #close() {

web/new_alt_text_manager.js

@@ -440,9 +440,7 @@ class NewAltTextManager {
   }
 
   #finish() {
-    if (this.#overlayManager.active === this.#dialog) {
+    this.#overlayManager.closeIfActive(this.#dialog);
-      this.#overlayManager.close(this.#dialog);
-    }
   }
 
   #close() {
@@ -696,9 +694,7 @@ class ImageAltTextSettings {
   }
 
   #finish() {
-    if (this.#overlayManager.active === this.#dialog) {
+    this.#overlayManager.closeIfActive(this.#dialog);
-      this.#overlayManager.close(this.#dialog);
-    }
   }
 }
 

web/overlay_manager.js

@@ -81,6 +81,17 @@ class OverlayManager {
     dialog.close();
     this.#active = null;
   }
+
+  /**
+   * @param {HTMLDialogElement} dialog - The overlay's DOM element.
+   * @returns {Promise} A promise that is resolved when the overlay has been
+   *                    closed.
+   */
+  async closeIfActive(dialog) {
+    if (this.#active === dialog) {
+      await this.close(dialog);
+    }
+  }
 }
 
 export { OverlayManager };

web/password_prompt.js

@@ -89,9 +89,7 @@ class PasswordPrompt {
   }
 
   async close() {
-    if (this.overlayManager.active === this.dialog) {
+    this.overlayManager.closeIfActive(this.dialog);
-      this.overlayManager.close(this.dialog);
-    }
   }
 
   #verify() {

web/pdf_print_service.js

@@ -148,9 +148,7 @@ class PDFPrintService {
     this.scratchCanvas = null;
     activeService = null;
     ensureOverlay().then(function () {
-      if (overlayManager.active === dialog) {
+      overlayManager.closeIfActive(dialog);
-        overlayManager.close(dialog);
-      }
     });
   }
 
@@ -260,9 +258,7 @@ window.print = function () {
     if (!activeService) {
       console.error("Expected print service to be initialized.");
       ensureOverlay().then(function () {
-        if (overlayManager.active === dialog) {
+        overlayManager.closeIfActive(dialog);
-          overlayManager.close(dialog);
-        }
       });
       return; // eslint-disable-line no-unsafe-finally
     }

web/signature_manager.js

@@ -826,9 +826,7 @@ class SignatureManager {
   }
 
   #finish() {
-    if (this.#overlayManager.active === this.#dialog) {
+    this.#overlayManager.closeIfActive(this.#dialog);
-      this.#overlayManager.close(this.#dialog);
-    }
   }
 
   #close() {
@@ -993,9 +991,7 @@ class EditDescriptionDialog {
   }
 
   #finish() {
-    if (this.#overlayManager.active === this.#dialog) {
+    this.#overlayManager.closeIfActive(this.#dialog);
-      this.#overlayManager.close(this.#dialog);
-    }
   }
 
   #close() {