totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-19 22:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle skipped segments

Browse Source
This commit is contained in:
Richard Harris
2019-05-05 11:36:02 -04:00
parent d51e1a0af8
commit c0ada5c52f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/app/app.ts
View File

@@ -288,14 +288,22 @@ export async function hydrate_target(target: Target): Promise<{
let l = 1; let l = 1;
try { try {
let segment_dirty = false;
branch = await Promise.all(route.parts.map(async (part, i) => { branch = await Promise.all(route.parts.map(async (part, i) => {
const segment = segments[i];
if (current_branch[i] && current_branch[i].segment !== segment) segment_dirty = true;
props.segments[l] = segments[i + 1]; // TODO make this less confusing props.segments[l] = segments[i + 1]; // TODO make this less confusing
if (!part) return null; if (!part) return { segment };
const j = l++; const j = l++;
const segment = segments[i]; if (!session_dirty && !segment_dirty && current_branch[i] && current_branch[i].part === part.i) {
if (!session_dirty && current_branch[i] && current_branch[i].segment === segment && current_branch[i].part === part.i) return current_branch[i]; return current_branch[i];
}
segment_dirty = false;
const { default: component, preload } = await load_component(components[part.i]); const { default: component, preload } = await load_component(components[part.i]);

2
test/apps/basics/src/routes/skipped/[one]/[two].svelte
View File

@@ -11,4 +11,4 @@
<h1>{one}:{two}</h1> <h1>{one}:{two}</h1>
<a href="y/1">y/1</a> <a href="skipped/y/1">skipped/y/1</a>