fix

src/common/navigate.ts

@@ -14,16 +14,19 @@ export interface NavigateOptions {
   data?: any;
 }
 
-export const navigate = async (path: string, options?: NavigateOptions) => {
+export const navigate = async (path: string, options?: NavigateOptions) =>
+  new Promise<boolean>((resolve) => {
+    // need to wait for history state to be updated in case a dialog was closed before calling navigate
+    setTimeout(async () => {
       const { history } = mainWindow;
       let replace = options?.replace || false;
-
       if (history.state?.dialog) {
         const closed = await closeAllDialogs();
         if (!closed) {
           // eslint-disable-next-line no-console
           console.warn("Navigation blocked, because dialog refused to close");
-      return false;
+          resolve(false);
+          return;
         }
         // if there were open dialogs, we discard the current state
         replace = true;
@@ -51,5 +54,6 @@ export const navigate = async (path: string, options?: NavigateOptions) => {
       fireEvent(mainWindow, "location-changed", {
         replace,
       });
-  return true;
+      resolve(true);
-};
+    });
+  });

src/dialogs/make-dialog-manager.ts

@@ -171,11 +171,21 @@ export const closeLastDialog = async () => {
         ""
       );
     }
+    return closed;
   }
+  return true;
 };
 
-export const closeAllDialogs = () =>
+export const closeAllDialogs = async () => {
-  Promise.all(OPEN_DIALOG_STACK.map((state) => closeDialog(state.dialogTag)));
+  while (OPEN_DIALOG_STACK.length) {
+    // eslint-disable-next-line no-await-in-loop
+    const closed = await closeLastDialog();
+    if (!closed) {
+      return false;
+    }
+  }
+  return true;
+};
 
 const _handleClosed = async (ev: HASSDomEvent<DialogClosedParams>) => {
   // If not closed by navigating back, remove the open state from history