Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: multiple fast navigate calls #20446

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: multiple fast navigate calls #20446

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da85da1
fix: multiple fast navigate calls
caalador Nov 12, 2024
cf17bd6
Merge branch 'main' into issues/20404-multiple-navigate-break-blocker
caalador Nov 18, 2024
c849bf2
Queue new navigations during ongoing navigation.
caalador Nov 18, 2024
7848db7
Merge branch 'main' into issues/20404-multiple-navigate-break-blocker
mshabarov Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions flow-server/src/main/resources/com/vaadin/flow/server/frontend/Flow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ function Flow() {
});
const location = useLocation();
const navigated = useRef<boolean>(false);
const blockerHandled = useRef<boolean>(false);
const fromAnchor = useRef<boolean>(false);
const containerRef = useRef<RouterContainer | undefined>(undefined);
const roundTrip = useRef<Promise<void> | undefined>(undefined);
Expand Down Expand Up @@ -361,8 +362,18 @@ function Flow() {

useEffect(() => {
if (blocker.state === 'blocked') {
if(blockerHandled.current) {
// Blocker is handled and the new navigation
// gets queued to be executed after the current handling ends.
const {pathname, state} = blocker.location;
queuedNavigate(pathname, true, { state: state, replace: true });
return;
}
blockerHandled.current = true;
let blockingPromise: any;
roundTrip.current = new Promise<void>((resolve,reject) => blockingPromise = {resolve:resolve,reject:reject});
// Release blocker handling after promise is fulfilled
roundTrip.current.then(() => blockerHandled.current = false, () => blockerHandled.current = false);

// Proceed to the blocked location, unless the navigation originates from a click on a link.
// In that case continue with function execution and perform a server round-trip
Expand Down
Loading