@sveltejs/kit 1.0.0-next.210 → 1.0.0-next.214

package/assets/kit.js

@@ -598,7 +598,7 @@ async function render_response({
 				navigating: writable(null),
 				session
 			},
-			page: { url, params },
+			page: { url, params, status, error },
 			components: branch.map(({ node }) => node.module.default)
 		};
 

package/assets/runtime/app/navigation.js

@@ -1,4 +1,4 @@
-import { router as router$1 } from '../internal/singletons.js';
+import { renderer, router as router$1 } from '../internal/singletons.js';
 import { g as get_base_uri } from '../chunks/utils.js';
 
 const router = /** @type {import('../client/router').Router} */ (router$1);
@@ -12,11 +12,21 @@ function guard(name) {
 	};
 }
 
+const disableScrollHandling = import.meta.env.SSR
+	? guard('disableScrollHandling')
+	: disableScrollHandling_;
 const goto = import.meta.env.SSR ? guard('goto') : goto_;
 const invalidate = import.meta.env.SSR ? guard('invalidate') : invalidate_;
 const prefetch = import.meta.env.SSR ? guard('prefetch') : prefetch_;
 const prefetchRoutes = import.meta.env.SSR ? guard('prefetchRoutes') : prefetchRoutes_;
 
+/**
+ * @type {import('$app/navigation').goto}
+ */
+async function disableScrollHandling_() {
+	renderer.disable_scroll_handling();
+}
+
 /**
  * @type {import('$app/navigation').goto}
  */
@@ -52,4 +62,4 @@ async function prefetchRoutes_(pathnames) {
 	await Promise.all(promises);
 }
 
-export { goto, invalidate, prefetch, prefetchRoutes };
+export { disableScrollHandling, goto, invalidate, prefetch, prefetchRoutes };

package/assets/runtime/app/stores.js

@@ -57,7 +57,7 @@ const navigating = {
 };
 
 /** @param {string} verb */
-const error = (verb) => {
+const throw_error = (verb) => {
 	throw new Error(
 		ssr
 			? `Can only ${verb} session store in browser`
@@ -77,8 +77,8 @@ const session = {
 
 		return store.subscribe(fn);
 	},
-	set: () => error('set'),
-	update: () => error('update')
+	set: () => throw_error('set'),
+	update: () => throw_error('update')
 };
 
 export { getStores, navigating, page, session, stores };

package/assets/runtime/internal/singletons.js

@@ -1,9 +1,18 @@
 /** @type {import('./router').Router?} */
 let router;
 
-/** @param {import('./router').Router?} _ */
-function init(_) {
-	router = _;
+/** @type {import('./renderer').Renderer} */
+let renderer;
+
+/**
+ * @param {{
+ *   router: import('./router').Router?;
+ *   renderer: import('./renderer').Renderer;
+ * }} opts
+ */
+function init(opts) {
+	router = opts.router;
+	renderer = opts.renderer;
 }
 
-export { init, router };
+export { init, renderer, router };

package/assets/runtime/internal/start.js

@@ -466,6 +466,8 @@ class Renderer {
 		this.session_id = 1;
 		this.invalid = new Set();
 		this.invalidating = null;
+		this.autoscroll = true;
+		this.updating = false;
 
 		/** @type {import('./types').NavigationState} */
 		this.current = {
@@ -508,6 +510,16 @@ class Renderer {
 		ready = true;
 	}
 
+	disable_scroll_handling() {
+		if (import.meta.env.DEV && this.started && !this.updating) {
+			throw new Error('Can only disable scroll handling during navigation');
+		}
+
+		if (this.updating || !this.started) {
+			this.autoscroll = false;
+		}
+	}
+
 	/**
 	 * @param {{
 	 *   status: number;
@@ -563,7 +575,7 @@ class Renderer {
 
 			result = error_args
 				? await this._load_error(error_args)
-				: await this._get_navigation_result_from_branch({ url, params, branch });
+				: await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 		} catch (e) {
 			if (error) throw e;
 
@@ -637,6 +649,8 @@ class Renderer {
 			}
 		}
 
+		this.updating = true;
+
 		if (this.started) {
 			this.current = navigation_result.state;
 
@@ -655,26 +669,9 @@ class Renderer {
 				document.body.focus();
 			}
 
-			const old_page_y_offset = Math.round(pageYOffset);
-			const old_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
-
 			await 0;
 
-			const new_page_y_offset = Math.round(pageYOffset);
-			const new_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
-
-			// After `await 0`, the `onMount()` function in the component executed.
-			// Check if no scrolling happened on mount.
-			const no_scroll_happened =
-				// In most cases, we can compare whether `pageYOffset` changed between navigation
-				new_page_y_offset === Math.min(old_page_y_offset, new_max_page_y_offset) ||
-				// But if the page is scrolled to/near the bottom, the browser would also scroll
-				// to/near the bottom of the new page on navigation. Since we can't detect when this
-				// behaviour happens, we naively compare by the y offset from the bottom of the page.
-				old_max_page_y_offset - old_page_y_offset === new_max_page_y_offset - new_page_y_offset;
-
-			// If there was no scrolling, we run on our custom scroll handling
-			if (no_scroll_happened) {
+			if (this.autoscroll) {
 				const deep_linked = hash && document.getElementById(hash.slice(1));
 				if (scroll) {
 					scrollTo(scroll.x, scroll.y);
@@ -694,6 +691,8 @@ class Renderer {
 
 		this.loading.promise = null;
 		this.loading.id = null;
+		this.autoscroll = true;
+		this.updating = false;
 
 		if (!this.router) return;
 
@@ -800,9 +799,11 @@ class Renderer {
 	 *   url: URL;
 	 *   params: Record<string, string>;
 	 *   branch: Array<import('./types').BranchNode | undefined>;
+	 *   status: number;
+	 *   error?: Error;
 	 * }} opts
 	 */
-	async _get_navigation_result_from_branch({ url, params, branch }) {
+	async _get_navigation_result_from_branch({ url, params, branch, status, error }) {
 		const filtered = /** @type {import('./types').BranchNode[] } */ (branch.filter(Boolean));
 		const redirect = filtered.find((f) => f.loaded && f.loaded.redirect);
 
@@ -826,7 +827,7 @@ class Renderer {
 		}
 
 		if (!this.current.url || url.href !== this.current.url.href) {
-			result.props.page = { url, params };
+			result.props.page = { url, params, status, error };
 
 			// TODO remove this for 1.0
 			/**
@@ -1120,12 +1121,12 @@ class Renderer {
 			}
 		}
 
-		return await this._get_navigation_result_from_branch({ url, params, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 	}
 
 	/**
 	 * @param {{
-	 *   status?: number;
+	 *   status: number;
 	 *   error: Error;
 	 *   url: URL;
 	 * }} opts
@@ -1153,7 +1154,7 @@ class Renderer {
 			})
 		];
 
-		return await this._get_navigation_result_from_branch({ url, params, branch });
+		return await this._get_navigation_result_from_branch({ url, params, branch, status, error });
 	}
 }
 
@@ -1200,7 +1201,7 @@ async function start({ paths, target, session, route, spa, trailing_slash, hydra
 		  })
 		: null;
 
-	init(router);
+	init({ router, renderer });
 	set_paths(paths);
 
 	if (hydrate) await renderer.start(hydrate);