From c2e7110c459c18248c4e391a281007805d9778fe Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Fri, 18 Mar 2022 22:55:50 -0500
Subject: fix loader

---
 src/lib/layout/Loader.svelte | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/layout/Loader.svelte b/src/lib/layout/Loader.svelte
index 901a780..3884e55 100644
--- a/src/lib/layout/Loader.svelte
+++ b/src/lib/layout/Loader.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+	import { browser } from '$app/env'
+	import { navigating } from '$app/stores'
+
 	let progress = 0
 
 	let widthTransitionDuration = 1000
@@ -20,12 +23,16 @@
 			progress = 0
 		}, 300)
 	}
-</script>
 
-<svelte:window
-	on:sveltekit:navigation-start={navigationStart}
-	on:sveltekit:navigation-end={navigationEnd}
-/>
+	let currentUrl: string | undefined = ''
+	navigating.subscribe(() => {
+		if (browser && $navigating?.to?.toString() !== currentUrl) {
+			if ($navigating) navigationStart()
+			else navigationEnd()
+			currentUrl = $navigating?.to?.toString()
+		}
+	})
+</script>
 
 <div
 	id="loader"
-- 
cgit