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

fix nested routes navigate

Browse Source
This commit is contained in:
cudr
2018-12-25 16:06:14 +03:00
parent 02cef046aa
commit cfba9b2168
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/src/client/app.ts
View File

@@ -36,7 +36,7 @@ const root_props: RootProps = {
export let prefetching: { export let prefetching: {
href: string; href: string;
promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number }>; promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number, new_segments?: any }>;
} = null; } = null;
export function set_prefetching(href, promise) { export function set_prefetching(href, promise) {
prefetching = { href, promise }; prefetching = { href, promise };
@@ -137,10 +137,13 @@ export function navigate(target: Target, id: number, noscroll?: boolean, hash?:
const token = current_token = {}; const token = current_token = {};
return loaded.then(({ redirect, data, nullable_depth }) => { return loaded.then(({ redirect, data, nullable_depth, new_segments }) => {
if (redirect) { if (redirect) {
return goto(redirect.location, { replaceState: true }); return goto(redirect.location, { replaceState: true });
} }
if (new_segments) {
segments = new_segments;
}
render(data, nullable_depth, scroll_history[id], noscroll, hash, token); render(data, nullable_depth, scroll_history[id], noscroll, hash, token);
if (document.activeElement) document.activeElement.blur(); if (document.activeElement) document.activeElement.blur();
}); });
@@ -285,11 +288,9 @@ export function prepare_page(target: Target): Promise<{
} }
}).then(results => { }).then(results => {
if (redirect) { if (redirect) {
return { redirect }; return { redirect, new_segments };
} }
segments = new_segments;
const get_params = page.parts[page.parts.length - 1].params || (() => ({})); const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
const params = get_params(target.match); const params = get_params(target.match);
@@ -303,6 +304,7 @@ export function prepare_page(target: Target): Promise<{
}; };
return { return {
new_segments,
data: Object.assign({}, props, { data: Object.assign({}, props, {
preloading: false, preloading: false,
child: { child: {
@@ -318,7 +320,7 @@ export function prepare_page(target: Target): Promise<{
path, path,
preloading: false, preloading: false,
child: Object.assign({}, root_props.child, { child: Object.assign({}, root_props.child, {
segment: segments[0] segment: new_segments[0]
}) })
}; };
if (changed(query, root_props.query)) data.query = query; if (changed(query, root_props.query)) data.query = query;
@@ -349,10 +351,10 @@ export function prepare_page(target: Target): Promise<{
} }
level = level.props.child; level = level.props.child;
level.segment = segments[i + 1]; level.segment = new_segments[i + 1];
} }
return { data, nullable_depth }; return { data, nullable_depth, new_segments };
}); });
} }
@@ -386,4 +388,4 @@ function detach(node: Node) {
function changed(a: Record<string, string | true>, b: Record<string, string | true>) { function changed(a: Record<string, string | true>, b: Record<string, string | true>) {
return JSON.stringify(a) !== JSON.stringify(b); return JSON.stringify(a) !== JSON.stringify(b);
} }