feat: improve usePrompt logic

arunjaindev · arunjaindev · commit 153cd030fedd · 2026-02-17T16:05:54.000+05:30
diff --git a/src/Shared/Hooks/UsePrompt/UsePrompt.tsx b/src/Shared/Hooks/UsePrompt/UsePrompt.tsx
@@ -42,13 +42,18 @@ const usePrompt = ({ shouldPrompt, message = DEFAULT_ROUTE_PROMPT_MESSAGE }: Use
         }
     }, [handlePageLeave])
 
-    const blocker = useBlocker(() => shouldPrompt)
+    const blocker = useBlocker(shouldPrompt)
 
     useEffect(() => {
         if (!blocker || blocker.state !== 'blocked') {
             return
         }
 
+        if (!shouldPrompt) {
+            blocker.proceed()
+            return
+        }
+
         // eslint-disable-next-line no-alert
         const proceed = window.confirm(message)
 
@@ -57,7 +62,7 @@ const usePrompt = ({ shouldPrompt, message = DEFAULT_ROUTE_PROMPT_MESSAGE }: Use
         } else {
             blocker.reset()
         }
-    }, [blocker, message])
+    }, [blocker, message, shouldPrompt])
 }
 
 export default usePrompt

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,18 @@ const usePrompt = ({ shouldPrompt, message = DEFAULT_ROUTE_PROMPT_MESSAGE }: Use`
`42`	`42`	`}`
`43`	`43`	`}, [handlePageLeave])`
`44`	`44`
`45`		`- const blocker = useBlocker(() => shouldPrompt)`
	`45`	`+ const blocker = useBlocker(shouldPrompt)`
`46`	`46`
`47`	`47`	`useEffect(() => {`
`48`	`48`	`if (!blocker \|\| blocker.state !== 'blocked') {`
`49`	`49`	`return`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ if (!shouldPrompt) {`
	`53`	`+ blocker.proceed()`
	`54`	`+ return`
	`55`	`+ }`
	`56`	`+`
`52`	`57`	`// eslint-disable-next-line no-alert`
`53`	`58`	`const proceed = window.confirm(message)`
`54`	`59`
`@@ -57,7 +62,7 @@ const usePrompt = ({ shouldPrompt, message = DEFAULT_ROUTE_PROMPT_MESSAGE }: Use`
`57`	`62`	`} else {`
`58`	`63`	`blocker.reset()`
`59`	`64`	`}`
`60`		`- }, [blocker, message])`
	`65`	`+ }, [blocker, message, shouldPrompt])`
`61`	`66`	`}`
`62`	`67`
`63`	`68`	`export default usePrompt`