From 86fd9a848e744425dfbce41691ac29029964d925 Mon Sep 17 00:00:00 2001
From: Steven Giesel <stgiesel35@gmail.com>
Date: Thu, 11 Apr 2024 12:57:16 +0200
Subject: [PATCH] Simplified ReadingIndicator and remove exceptions

---
 .../Components/ReadingIndicator.razor          |  6 ------
 .../Components/ReadingIndicator.razor.js       | 18 +++++-------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor
index dad2ca71..22448b63 100644
--- a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor
@@ -1,5 +1,4 @@
 @inject IJSRuntime JSRuntime
-@implements IAsyncDisposable
 
 <div class="progress-container" @ref="progressContainer">
     <svg class="progress-circle" viewBox="0 0 36 36">
@@ -22,9 +21,4 @@
 			await JSRuntime.InvokeVoidAsync("initCircularReadingProgress", ContainerCssSelector, progressContainer);
 		}
 	}
-
-	public async ValueTask DisposeAsync()
-	{
-		await JSRuntime.InvokeVoidAsync("destroyCircularReadingProgress");
-	}
 }
diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor.js b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor.js
index 3d1b5f7e..6ad808fd 100644
--- a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor.js
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ReadingIndicator.razor.js
@@ -22,13 +22,11 @@ function hideProgressIndicator(progressContainer) {
     }, 500);
 }
 
-function onScroll(onScroll) {
-    if (!rafId) {
-        rafId = requestAnimationFrame(onScroll);
-    }
-}
-
 window.initCircularReadingProgress = (parentContainer, progressContainer) => {
+		if (window.circularProgressScrollListenerAdded) {
+			return;
+		}
+
     const progressBar = document.getElementById('progressBar');
 
     const onScroll = () => {
@@ -50,11 +48,5 @@ window.initCircularReadingProgress = (parentContainer, progressContainer) => {
         rafId = null;
     };
 
-    window.addEventListener('scroll', onScroll) ;
+    window.addEventListener('scroll', onScroll);
 };
-
-window.destroyCircularReadingProgress = () => {
-    window.removeEventListener('scroll', onScroll);
-    clearTimeout(progressTimeout);
-    cancelAnimationFrame(rafId);
-}
\ No newline at end of file