-
Notifications
You must be signed in to change notification settings - Fork 547
Fix(Tx flow): prevent navigation when tx modal is open #4909
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c4b6197
Fix(Tx flow): prevent navigation when tx modal is open
katspaugh a623b82
Fix test
katspaugh de39560
Pull from dev
katspaugh cb67a7f
Simplify logic
katspaugh ed31fbc
Make onNavigate check clearer
katspaugh b0f3d5e
Merge branch 'dev' of github.com:safe-global/safe-wallet-monorepo int…
katspaugh ce2e349
Merge branch 'dev' of github.com:safe-global/safe-wallet-monorepo int…
katspaugh d454994
Add Back/Forward prevention
katspaugh 652f6be
Clear timeout
katspaugh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
import { useEffect, useRef } from 'react' | ||
import { useRouter } from 'next/router' | ||
|
||
export function usePreventNavigation(onNavigate?: () => boolean): void { | ||
const router = useRouter() | ||
const currentPathRef = useRef(router.asPath) | ||
|
||
// Sync current path ref with router | ||
useEffect(() => { | ||
const delay = setTimeout(() => { | ||
currentPathRef.current = router.asPath | ||
}, 300) | ||
return () => { | ||
clearTimeout(delay) | ||
} | ||
}, [router.asPath]) | ||
|
||
useEffect(() => { | ||
if (!onNavigate) return | ||
|
||
const onLinkClick = (e: MouseEvent) => { | ||
const target = e.target as HTMLElement | ||
const link = target.closest('a') | ||
const href = link?.getAttribute('href') | ||
if (!link || !href) return | ||
|
||
const isAllowedToNavigate = onNavigate() | ||
if (isAllowedToNavigate) { | ||
router.push(href) | ||
} else { | ||
e.preventDefault() | ||
e.stopImmediatePropagation() | ||
e.stopPropagation() | ||
} | ||
} | ||
|
||
document.addEventListener('mousedown', onLinkClick) | ||
|
||
return () => { | ||
document.removeEventListener('mousedown', onLinkClick) | ||
katspaugh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
}, [router, onNavigate]) | ||
|
||
// Prevent Back/Forward navigation | ||
useEffect(() => { | ||
router.beforePopState(() => { | ||
const prevUrl = currentPathRef.current | ||
if (onNavigate) { | ||
const isAllowedToNavigate = onNavigate() | ||
|
||
if (!isAllowedToNavigate) { | ||
// Cancel navigation and reset the URL back | ||
router.replace(prevUrl) | ||
return false | ||
} | ||
} | ||
return true | ||
}) | ||
|
||
return () => router.beforePopState(() => true) | ||
}, [router, onNavigate]) | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.