@sveltejs/kit 1.16.1 → 1.16.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",

package/src/runtime/client/client.js

@@ -1125,7 +1125,7 @@ export function create_client(app, target) {
 			document.activeElement !== document.body;
 
 		if (!keepfocus && !changed_focus) {
-			await reset_focus();
+			reset_focus();
 		}
 
 		autoscroll = true;
@@ -1135,6 +1135,11 @@ export function create_client(app, target) {
 		}
 
 		navigating = false;
+
+		if (type === 'popstate') {
+			restore_snapshot(current_history_index);
+		}
+
 		callbacks.after_navigate.forEach((fn) =>
 			fn(/** @type {import('types').AfterNavigate} */ (navigation))
 		);
@@ -1638,7 +1643,6 @@ export function create_client(app, target) {
 					}
 
 					const delta = event.state[INDEX_KEY] - current_history_index;
-					let blocked = false;
 
 					await navigate({
 						url: new URL(location.href),
@@ -1651,15 +1655,10 @@ export function create_client(app, target) {
 						},
 						blocked: () => {
 							history.go(-delta);
-							blocked = true;
 						},
 						type: 'popstate',
 						delta
 					});
-
-					if (!blocked) {
-						restore_snapshot(current_history_index);
-					}
 				}
 			});
 
@@ -1909,7 +1908,8 @@ function reset_focus() {
 		const tabindex = root.getAttribute('tabindex');
 
 		root.tabIndex = -1;
-		root.focus({ preventScroll: true });
+		// @ts-expect-error
+		root.focus({ preventScroll: true, focusVisible: false });
 
 		// restore `tabindex` as to prevent `root` from stealing input from elements
 		if (tabindex !== null) {
@@ -1918,12 +1918,44 @@ function reset_focus() {
 			root.removeAttribute('tabindex');
 		}
 
-		return new Promise((resolve) => {
+		// capture current selection, so we can compare the state after
+		// snapshot restoration and afterNavigate callbacks have run
+		const selection = getSelection();
+
+		if (selection && selection.type !== 'None') {
+			/** @type {Range[]} */
+			const ranges = [];
+
+			for (let i = 0; i < selection.rangeCount; i += 1) {
+				ranges.push(selection.getRangeAt(i));
+			}
+
 			setTimeout(() => {
+				if (selection.rangeCount !== ranges.length) return;
+
+				for (let i = 0; i < selection.rangeCount; i += 1) {
+					const a = ranges[i];
+					const b = selection.getRangeAt(i);
+
+					// we need to do a deep comparison rather than just `a !== b` because
+					// Safari behaves differently to other browsers
+					if (
+						a.commonAncestorContainer !== b.commonAncestorContainer ||
+						a.startContainer !== b.startContainer ||
+						a.endContainer !== b.endContainer ||
+						a.startOffset !== b.startOffset ||
+						a.endOffset !== b.endOffset
+					) {
+						return;
+					}
+				}
+
+				// if the selection hasn't changed (as a result of an element being (auto)focused,
+				// or a programmatic selection, we reset everything as part of the navigation)
 				// fixes https://github.com/sveltejs/kit/issues/8439
-				resolve(getSelection()?.removeAllRanges());
+				selection.removeAllRanges();
 			});
-		});
+		}
 	}
 }
 

package/src/utils/routing.js

@@ -96,7 +96,7 @@ export function parse_route_id(id) {
 	return { pattern, params };
 }
 
-const basic_param_pattern = /\[(\[)?(?:\.\.\.)?(\w+?)(?:=(\w+))?\]\]?/;
+const basic_param_pattern = /\[(\[)?(?:\.\.\.)?(\w+?)(?:=(\w+))?\]\]?/g;
 
 /**
  * Parses a route ID, then resolves it to a path by replacing parameters with actual values from `entry`.
@@ -112,29 +112,23 @@ export function resolve_entry(id, entry) {
 	return (
 		'/' +
 		segments
-			.map((segment) => {
-				const match = basic_param_pattern.exec(segment);
-
-				// static content -- i.e. not a param
-				if (!match) return segment;
-
-				const optional = !!match[1];
-				const name = match[2];
-				const param_value = entry[name];
-
-				// This is nested so TS correctly narrows the type
-				if (!param_value) {
-					if (optional) return '';
-					throw new Error(`Missing parameter '${name}' in route ${id}`);
-				}
-
-				if (param_value.startsWith('/') || param_value.endsWith('/'))
-					throw new Error(
-						`Parameter '${name}' in route ${id} cannot start or end with a slash -- this would cause an invalid route like foo//bar`
-					);
-
-				return param_value;
-			})
+			.map((segment) =>
+				segment.replace(basic_param_pattern, (_, optional, name) => {
+					const param_value = entry[name];
+
+					// This is nested so TS correctly narrows the type
+					if (!param_value) {
+						if (optional) return '';
+						throw new Error(`Missing parameter '${name}' in route ${id}`);
+					}
+
+					if (param_value.startsWith('/') || param_value.endsWith('/'))
+						throw new Error(
+							`Parameter '${name}' in route ${id} cannot start or end with a slash -- this would cause an invalid route like foo//bar`
+						);
+					return param_value;
+				})
+			)
 			.filter(Boolean)
 			.join('/')
 	);

package/src/utils/url.js

@@ -93,9 +93,15 @@ export function decode_uri(uri) {
 /**
  * URL properties that could change during the lifetime of the page,
  * which excludes things like `origin`
- * @type {Array<keyof URL>}
  */
-const tracked_url_properties = ['href', 'pathname', 'search', 'searchParams', 'toString', 'toJSON'];
+const tracked_url_properties = /** @type {const} */ ([
+	'href',
+	'pathname',
+	'search',
+	'searchParams',
+	'toString',
+	'toJSON'
+]);
 
 /**
  * @param {URL} url
@@ -105,12 +111,10 @@ export function make_trackable(url, callback) {
 	const tracked = new URL(url);
 
 	for (const property of tracked_url_properties) {
-		let value = tracked[property];
-
 		Object.defineProperty(tracked, property, {
 			get() {
 				callback();
-				return value;
+				return url[property];
 			},
 
 			enumerable: true,