Skip to content

client-side router ignores links outside app target #7766

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

Merged
merged 2 commits into from
Nov 22, 2022
Merged

client-side router ignores links outside app target #7766

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
e8d3d42
client-side router ignores links outside app target - closes #7763
Rich-Harris Nov 22, 2022
9ecf9ba
Update .changeset/strange-roses-sell.md
Rich-Harris Nov 22, 2022
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/strange-roses-sell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[breaking] Make client-side router ignore links outside %sveltekit.body%
10 changes: 5 additions & 5 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 @@ -75,7 +75,7 @@ function check_for_removed_attributes() {

/**
* @param {{
* target: Element;
* target: HTMLElement;
* base: string;
* }} opts
* @returns {import('./types').Client}
Expand Down Expand Up @@ -1385,12 +1385,12 @@ export function create_client({ target, base }) {
}, 20);
};

addEventListener('touchstart', trigger_prefetch);
addEventListener('mousemove', handle_mousemove);
addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);
target.addEventListener('touchstart', trigger_prefetch);
target.addEventListener('mousemove', handle_mousemove);
target.addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);

/** @param {MouseEvent} event */
addEventListener('click', (event) => {
target.addEventListener('click', (event) => {
// Adapted from https://github.com/visionmedia/page.js
// MIT license https://github.com/visionmedia/page.js#license
if (event.button || event.which !== 1) return;
Expand Down
3 changes: 2 additions & 1 deletion packages/kit/test/apps/basics/src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
%sveltekit.head%
</head>
<body>
%sveltekit.body%
<div>%sveltekit.body%</div>
<a href="/routing/link-outside-app-target/target">outside app target</a>
</body>
</html>
8 changes: 8 additions & 0 deletions packages/kit/test/apps/basics/src/routes/routing/link-outside-app-target/source/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script>
import { onMount } from 'svelte';
import { increment, count } from '../state.js';

onMount(increment);
</script>

<h1>source: {count}</h1>
5 changes: 5 additions & 0 deletions packages/kit/test/apps/basics/src/routes/routing/link-outside-app-target/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export let count = 0;

export function increment() {
count += 1;
}
5 changes: 5 additions & 0 deletions packages/kit/test/apps/basics/src/routes/routing/link-outside-app-target/target/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script>
import { count } from '../state.js';
</script>

<h1>target: {count}</h1>
7 changes: 7 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 @@ -805,6 +805,13 @@ test.describe('Routing', () => {
await page.goForward();
expect(await page.textContent('h1')).toBe('hello');
});

test('ignores clicks outside the app target', async ({ page }) => {
await page.goto('/routing/link-outside-app-target/source');

await page.click('[href="/routing/link-outside-app-target/target"]');
expect(await page.textContent('h1')).toBe('target: 0');
});
});

test.describe('Shadow DOM', () => {
Expand Down