Skip to content

Commit 8f14bb5

Browse files
committed
fix(qwik-city): link/useNavigate query params override thrown redirect's in loader/middleware
1 parent 7bb5229 commit 8f14bb5

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.changeset/every-socks-beg.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik-city': patch
3+
---
4+
5+
FIX: link/useNavigate query params don't override thrown redirect's in loader/middleware anymore.

packages/qwik-city/src/runtime/src/qwik-city-component.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
383383
const pageModule = contentModules[contentModules.length - 1] as PageModule;
384384

385385
// Restore search params unless it's a redirect
386-
const isRedirect = navType === 'form' && !isSamePath(trackUrl, prevUrl);
387-
if (navigation.dest.search && !isRedirect) {
386+
if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
388387
trackUrl.search = navigation.dest.search;
389388
}
390389

@@ -430,7 +429,8 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
430429
(navigation.scroll &&
431430
(!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) &&
432431
(navType === 'link' || navType === 'popstate')) ||
433-
isRedirect
432+
// Action might have responded with a redirect.
433+
(navType === 'form' && !isSamePath(trackUrl, prevUrl))
434434
) {
435435
// Mark next DOM render to scroll.
436436
(document as any).__q_scroll_restore__ = () =>

0 commit comments

Comments
 (0)