Skip to content

fix: update pushState function to reflect the new url in the page store #11994

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

Closed
wants to merge 2 commits into from
Closed

fix: update pushState function to reflect the new url in the page store #11994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4d5eb7
fix: update `pushState` function to reflect the new url in the `page`…
SunPodder Mar 16, 2024
0bce072
fix: update `replaceState` function to reflect the new url in the `pa…
SunPodder Mar 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
5 changes: 5 additions & 0 deletions .changeset/rich-dryers-design.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@sveltejs/kit": patch
---

fix: update `page` store when `pushState` or `replaceState` is called
12 changes: 8 additions & 4 deletions packages/kit/src/runtime/client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,10 +1876,12 @@ export function pushState(url, state) {
[STATES_KEY]: state
};

history.pushState(opts, '', resolve_url(url));
const url_object = resolve_url(url);

history.pushState(opts, '', url_object);
has_navigated = true;

page = { ...page, state };
page = { ...page, state, url: url_object, route: { id: url_object.pathname } };
root.$set({ page });

clear_onward_history(current_history_index, current_navigation_index);
Expand Down Expand Up @@ -1914,9 +1916,11 @@ export function replaceState(url, state) {
[STATES_KEY]: state
};

history.replaceState(opts, '', resolve_url(url));
const url_object = resolve_url(url);

history.replaceState(opts, '', url_object);

page = { ...page, state };
page = { ...page, state, url: url_object, route: { id: url_object.pathname } };
root.$set({ page });
}

Expand Down
1 change: 1 addition & 0 deletions packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
<button data-id="invalidate" on:click={invalidateAll}>invalidate all</button>

<p>active: {$page.state.active ?? false}</p>
<div class="route_id">route.id: {$page.route.id}</div>
<span>{data.now}</span>
1 change: 1 addition & 0 deletions packages/kit/test/apps/basics/src/routes/shallow-routing/replace-state/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
<button data-id="two" on:click={two}>replace state on child page</button>

<p>active: {$page.state.active ?? false}</p>
<div class="route_id">route.id: {$page.route.id}</div>
10 changes: 10 additions & 0 deletions packages/kit/test/apps/basics/test/client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,11 +1045,15 @@ test.describe('Shallow routing', () => {
test('Pushes state to a new URL', async ({ baseURL, page }) => {
await page.goto('/shallow-routing/push-state');
await expect(page.locator('p')).toHaveText('active: false');
await expect(page.locator('div.route_id')).toHaveText('route.id: /shallow-routing/push-state');

await page.locator('[data-id="two"]').click();
expect(page.url()).toBe(`${baseURL}/shallow-routing/push-state/a`);
await expect(page.locator('h1')).toHaveText('parent');
await expect(page.locator('p')).toHaveText('active: true');
await expect(page.locator('div.route_id')).toHaveText(
'route.id: /shallow-routing/push-state/a'
);

await page.reload();
await expect(page.locator('h1')).toHaveText('a');
Expand Down Expand Up @@ -1115,8 +1119,14 @@ test.describe('Shallow routing', () => {
await page.goto('/shallow-routing/replace-state/b');
await clicknav('[href="/shallow-routing/replace-state"]');

await expect(page.locator('div.route_id')).toHaveText(
'route.id: /shallow-routing/replace-state'
);
await page.locator('[data-id="two"]').click();
await expect(page.locator('p')).toHaveText('active: true');
await expect(page.locator('div.route_id')).toHaveText(
'route.id: /shallow-routing/replace-state/a'
);

await page.goBack();
expect(page.url()).toBe(`${baseURL}/shallow-routing/replace-state/b`);
Expand Down