Updated WindowService to return new instance.

KristofferStrube · Apr 8, 2024 · 9e3a670 · 9e3a670
1 parent aa19147
commit 9e3a670
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/samples/KristofferStrube.Blazor.Window.WasmExample/Pages/Home.razor b/samples/KristofferStrube.Blazor.Window.WasmExample/Pages/Home.razor
@@ -1,4 +1,5 @@
 @page "/"
+@implements IAsyncDisposable
 @inject IWindowService WindowService
 
 @if (!Popup.HasValue)
@@ -66,4 +67,12 @@ else
     {
         await window.PostMessageAsync($"From Pop-up {Popup} \"{message}\"");
     }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (window is not null)
+        {
+            await window.DisposeAsync();
+        }
+    }
 }
diff --git a/samples/KristofferStrube.Blazor.Window.WasmExample/Pages/Messages.razor b/samples/KristofferStrube.Blazor.Window.WasmExample/Pages/Messages.razor
@@ -82,6 +82,10 @@
             await popup.DisposeAsync();
         }
         await messageEventListener.DisposeAsync();
+        if (window is not null)
+        {
+            await window.DisposeAsync();
+        }
     }
 
     public record LogEntry(string message, string origin)

diff --git a/src/KristofferStrube.Blazor.Window/IWindowService.cs b/src/KristofferStrube.Blazor.Window/IWindowService.cs
@@ -11,7 +11,7 @@ public interface IWindowService
     /// Returns a <see cref="Window"/>.
     /// </summary>
     /// <remarks>
-    /// Following calls to this method on the same instance of a <see cref="IWindowService"/> will return the same instance.
+    /// You should dispose of this <see cref="Window"/> once you are done using it to free the reference.
     /// </remarks>
     Task<Window> GetWindowAsync();
 }
diff --git a/src/KristofferStrube.Blazor.Window/WindowService.cs b/src/KristofferStrube.Blazor.Window/WindowService.cs
@@ -3,40 +3,23 @@
 namespace KristofferStrube.Blazor.Window;
 
 /// <inheritdoc cref="IWindowService"/>
-public class WindowService : IAsyncDisposable, IWindowService
+public class WindowService : IWindowService
 {
-    private readonly Lazy<Task<Window>> windowTask;
+    private readonly IJSRuntime jSRuntime;
 
     /// <summary>
     /// Constructs a new instance of the service.
     /// </summary>
     /// <param name="jSRuntime">An <see cref="IJSRuntime"/> instance.</param>
     public WindowService(IJSRuntime jSRuntime)
     {
-        windowTask = new(async () =>
-        {
-            IJSObjectReference jSInstance = await jSRuntime.InvokeAsync<IJSObjectReference>("window.valueOf");
-            return await Window.CreateAsync(jSRuntime, jSInstance);
-        });
+        this.jSRuntime = jSRuntime;
     }
 
     /// <inheritdoc/>
     public async Task<Window> GetWindowAsync()
     {
-        return await windowTask.Value;
-    }
-
-    /// <summary>
-    /// Disposes the service.
-    /// </summary>
-    public async ValueTask DisposeAsync()
-    {
-        if (windowTask.IsValueCreated)
-        {
-            Window window = await windowTask.Value;
-            await window.JSReference.DisposeAsync();
-            await (await windowTask.Value).DisposeAsync();
-        }
-        GC.SuppressFinalize(this);
+        IJSObjectReference jSInstance = await jSRuntime.InvokeAsync<IJSObjectReference>("window.valueOf");
+        return await Window.CreateAsync(jSRuntime, jSInstance, new() { DisposesJSReference = true });
     }
 }