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

simplify, preserve monomorphism

Browse Source
This commit is contained in:
Rich Harris
2018-10-15 22:07:23 -04:00
parent 635c13a175
commit cca417a85a
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,17 +106,19 @@ export function scroll_state() {
}; };
} }
export function navigate(target: Target, id: number, scroll_to?: ScrollPosition | string): Promise<any> { export function navigate(target: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
let scroll: ScrollPosition | string; let scroll: ScrollPosition;
if (id) { if (id) {
// popstate or initial navigation // popstate or initial navigation
cid = id; cid = id;
scroll = scroll_to ? scroll_to : scroll_history[id];
} else { } else {
const current_scroll = scroll_state();
// clicked on a link. preserve scroll state // clicked on a link. preserve scroll state
scroll_history[cid] = scroll_state(); scroll_history[cid] = current_scroll;
id = cid = ++uid; id = cid = ++uid;
scroll = scroll_to ? scroll_to : { x: 0, y: 0 }; scroll_history[cid] = noscroll ? current_scroll : { x: 0, y: 0 };
} }
cid = id; cid = id;
@@ -136,12 +138,12 @@ export function navigate(target: Target, id: number, scroll_to?: ScrollPosition
if (redirect) { if (redirect) {
return goto(redirect.location, { replaceState: true }); return goto(redirect.location, { replaceState: true });
} }
render(data, nullable_depth, scroll, token); render(data, nullable_depth, scroll_history[id], noscroll, hash, token);
if (document.activeElement) document.activeElement.blur(); if (document.activeElement) document.activeElement.blur();
}); });
} }
function render(data: any, nullable_depth: number, scroll: ScrollPosition | string, token: {}) { function render(data: any, nullable_depth: number, scroll: ScrollPosition, noscroll: boolean, hash: string, token: {}) {
if (current_token !== token) return; if (current_token !== token) return;
if (root_component) { if (root_component) {
@@ -180,19 +182,20 @@ function render(data: any, nullable_depth: number, scroll: ScrollPosition | stri
}); });
} }
if (scroll) { if (!noscroll) {
let scrollPos: ScrollPosition; if (hash) {
if (typeof scroll === 'string') {
// scroll is an element id (from a hash), we need to compute y. // scroll is an element id (from a hash), we need to compute y.
const deep_linked = document.getElementById(scroll); const deep_linked = document.querySelector(hash);
scrollPos = deep_linked ? if (deep_linked) {
{ x: 0, y: deep_linked.getBoundingClientRect().top } : scroll = {
scroll_state(); x: 0,
} else { y: deep_linked.getBoundingClientRect().top
scrollPos = scroll; };
}
} }
scroll_history[cid] = scrollPos;
scrollTo(scrollPos.x, scrollPos.y); scroll_history[cid] = scroll;
if (scroll) scrollTo(scroll.x, scroll.y);
} }
Object.assign(root_props, data); Object.assign(root_props, data);

14
templates/src/client/start/index.ts
View File

@@ -35,13 +35,12 @@ export default function start(opts: {
return Promise.resolve().then(() => { return Promise.resolve().then(() => {
const { hash, href } = location; const { hash, href } = location;
const scroll_to = hash ? hash.slice(1) : scroll_state();
history.replaceState({ id: uid }, '', href); history.replaceState({ id: uid }, '', href);
if (!initial_data.error) { if (!initial_data.error) {
const target = select_route(new URL(location.href)); const target = select_route(new URL(location.href));
if (target) return navigate(target, uid, scroll_to); if (target) return navigate(target, uid, false, hash);
} }
}); });
} }
@@ -100,16 +99,7 @@ function handle_click(event: MouseEvent) {
const target = select_route(url); const target = select_route(url);
if (target) { if (target) {
const noscroll = a.hasAttribute('sapper-noscroll'); const noscroll = a.hasAttribute('sapper-noscroll');
let scroll_to: ScrollPosition | string; navigate(target, null, noscroll, url.hash);
if (noscroll) {
scroll_to = scroll_state();
} else if (url.hash) {
scroll_to = url.hash.slice(1);
} else {
scroll_to = { x: 0, y: 0 };
}
navigate(target, null, scroll_to);
event.preventDefault(); event.preventDefault();
history.pushState({ id: cid }, '', url.href); history.pushState({ id: cid }, '', url.href);
} }