jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-11-09 10:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix helper dialog close and add failsafe for similar cases (#23468)

Browse Source
This commit is contained in:
Petar Petrov
2024-12-30 12:51:21 +02:00
committed by GitHub
parent d0327915db
commit e1a6f6f0e3
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/navigate.ts
View File

@@ -14,9 +14,16 @@ export interface NavigateOptions {
data?: any;
}
export const navigate = async (path: string, options?: NavigateOptions) => {
// max time to wait for dialogs to close before navigating
const DIALOG_WAIT_TIMEOUT = 500;
export const navigate = async (
path: string,
options?: NavigateOptions,
timestamp = Date.now()
) => {
const { history } = mainWindow;
if (history.state?.dialog) {
if (history.state?.dialog && Date.now() - timestamp < DIALOG_WAIT_TIMEOUT) {
const closed = await closeAllDialogs();
if (!closed) {
// eslint-disable-next-line no-console
@@ -26,7 +33,7 @@ export const navigate = async (path: string, options?: NavigateOptions) => {
return new Promise<boolean>((resolve) => {
// need to wait for history state to be updated in case a dialog was closed
setTimeout(() => {
navigate(path, options).then(resolve);
navigate(path, options, timestamp).then(resolve);
});
});
}