From 1fffdf45480047ee8374a4ff9dd1a3295962a5e4 Mon Sep 17 00:00:00 2001 From: "Taras.Hlukhovetskyi" Date: Fri, 17 May 2024 16:32:59 +0300 Subject: [PATCH] Fix [Modal wizards] The "Are you sure?" pop-up does not appear on the browser's back navigation --- src/hooks/useModalBlockHistory.hook.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/hooks/useModalBlockHistory.hook.js b/src/hooks/useModalBlockHistory.hook.js index baed4b5fc9..48ce47c04f 100644 --- a/src/hooks/useModalBlockHistory.hook.js +++ b/src/hooks/useModalBlockHistory.hook.js @@ -17,7 +17,7 @@ illegal under applicable law, and the grant of the foregoing license under the Apache 2.0 license is conditioned upon your compliance with such restriction. */ -import { useCallback } from 'react' +import { useCallback, useEffect } from 'react' import { useBlocker } from 'react-router-dom' import { defaultCloseModalHandler } from '../utils/defaultCloseModalHandler' @@ -59,5 +59,11 @@ export const useModalBlockHistory = (closeModal, form) => { ) }, [form, resolveModal, handleRejectConfirmation]) + useEffect(() => { + if (blocker.state === 'blocked') { + handleCloseModal() + } + }, [blocker, handleCloseModal]) + return { handleCloseModal, resolveModal } }