@onsvisual/svelte-components 1.1.47 → 1.1.49

package/dist/components/Header/Header.svelte

@@ -64,7 +64,7 @@
 	 */
 	export let legacy = false;
 	/**
-	 * Optional: Pass the "page" store from "$app/state" in SvelteKit (gets read from context by default if it exists)
+	 * Optional: Pass the "page" state from "$app/state" in SvelteKit (gets read from context by default if it exists)
 	 * @type {any}
 	 */
 	export let page = getContext("page");
@@ -87,8 +87,9 @@
 	let path = "";
 	let activeLink = null;
 
-	function setPaths() {
-		const url = page?.url || document.location;
+	function setPaths(page) {
+		if (!page) return;
+		const url = page.url;
 		lang = url.host.startsWith("cy") ? "cy" : "en";
 		baseurl = lang === "cy" ? "https://cy.ons.gov.uk" : "https://www.ons.gov.uk";
 		baseother = lang === "cy" ? "https://www.ons.gov.uk" : "https://cy.ons.gov.uk";
@@ -115,24 +116,22 @@
 		Cymraeg: "English",
 		"Newid iaith i": "Change language to"
 	};
-
 	$: i18n = (text) => (lang === "cy" && texts[text] ? texts[text] : text);
 
 	onMount(() => {
-		setPaths();
+		setPaths(page || { url: document?.location });
 
 		if ((!compact && !legacy) || (title && Array.isArray(navLinks))) {
-			const hasBodyClass = "className" in document.body || {};
-			const bodyClassString = document.body?.className || "";
+			const hasBodyClass = "className" in document?.body || {};
+			const bodyClassString = document?.body?.className || "";
 			if (hasBodyClass && !bodyClassString.includes("ons-js-enabled"))
 				document.body.className = bodyClassString + " ons-js-enabled";
 			initNav(el?.parentElement || document);
 		}
 	});
+	$: setPaths(page);
 </script>
 
-<svelte:window onpopstate={setPaths} />
-
 <header
 	class="ons-header"
 	class:ons-header--basic={!compact && !legacy}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onsvisual/svelte-components",
-	"version": "1.1.47",
+	"version": "1.1.49",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "npm run build:package && npm run build:docs",