feat(butil): improve disposing of VisualViewport class of Butil #6984 (…

…#6989)
bitfoundation · Feb 27, 2024 · 7efd194 · 7efd194
1 parent ca40340
commit 7efd194
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 17 deletions.
diff --git a/src/Butil/Bit.Butil/Publics/VisualViewport.cs b/src/Butil/Bit.Butil/Publics/VisualViewport.cs
@@ -103,19 +103,21 @@ public async ValueTask<Guid> AddResize(Action handler)
 
         return listenerId;
     }
+
     /// <summary>
     /// Fired when the visual viewport is resized.
     /// <br/>
     /// <see href="https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport/resize_event">https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport/resize_event</see>
     /// </summary>
-    public async Task<Guid[]> RemoveResize(Action handler)
+    public async ValueTask<Guid[]> RemoveResize(Action handler)
     {
         var ids = VisualViewportListenersManager.RemoveListener(handler);
 
         await RemoveResize(ids);
 
         return ids;
     }
+
     /// <summary>
     /// Fired when the visual viewport is resized.
     /// <br/>
@@ -127,22 +129,22 @@ public async ValueTask RemoveResize(Guid id)
 
         await RemoveResize([id]);
     }
+
     private async ValueTask RemoveResize(Guid[] ids)
     {
+        if (ids.Length == 0) return;
+
         foreach (var id in ids)
         {
             _handlers.TryRemove(id, out _);
         }
 
-        await js.InvokeVoidAsync("BitButil.visualViewport.removeResize", ids);
+        await RemoveResizeFromJs(ids);
     }
-    public async ValueTask RemoveAllResizes()
-    {
-        var ids = _handlers.Select(h => h.Key).ToArray();
-
-        _handlers.Clear();
 
-        VisualViewportListenersManager.RemoveListeners(ids);
+    private async ValueTask RemoveResizeFromJs(Guid[] ids)
+    {
+        if (OperatingSystem.IsBrowser() is false) return;
 
         await js.InvokeVoidAsync("BitButil.visualViewport.removeResize", ids);
     }
@@ -162,19 +164,21 @@ public async ValueTask<Guid> AddScroll(Action handler)
 
         return listenerId;
     }
+
     /// <summary>
     /// Fired when the visual viewport is scrolled.
     /// <br/>
     /// <see href="https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport/scroll_event">https://developer.mozilla.org/en-US/docs/Web/API/VisualViewport/scroll_event</see>
     /// </summary>
-    public async Task<Guid[]> RemoveScroll(Action handler)
+    public async ValueTask<Guid[]> RemoveScroll(Action handler)
     {
         var ids = VisualViewportListenersManager.RemoveListener(handler);
 
         await RemoveScroll(ids);
 
         return ids;
     }
+
     /// <summary>
     /// Fired when the visual viewport is scrolled.
     /// <br/>
@@ -186,32 +190,39 @@ public async ValueTask RemoveScroll(Guid id)
 
         await RemoveScroll([id]);
     }
+
     private async ValueTask RemoveScroll(Guid[] ids)
     {
         foreach (var id in ids)
         {
             _handlers.TryRemove(id, out _);
         }
 
+        await RemoveScrollFromJs(ids);
+    }
+
+    private async ValueTask RemoveScrollFromJs(Guid[] ids)
+    {
+        if (OperatingSystem.IsBrowser() is false) return;
+
         await js.InvokeVoidAsync("BitButil.visualViewport.removeScroll", ids);
     }
-    public async ValueTask RemoveAllScrolls()
+
+
+    public async ValueTask RemoveAllEventHandlers()
     {
+        if (_handlers.Count == 0) return;
+
         var ids = _handlers.Select(h => h.Key).ToArray();
 
         _handlers.Clear();
 
         VisualViewportListenersManager.RemoveListeners(ids);
 
-        await js.InvokeVoidAsync("BitButil.visualViewport.removeScroll", ids);
-    }
-
-    public async ValueTask DisposeAsync()
-    {
         var toAwait = new List<Task>();
 
-        var resizeValueTask = RemoveAllResizes();
-        var scrollValueTask = RemoveAllScrolls();
+        var resizeValueTask = RemoveResizeFromJs(ids);
+        var scrollValueTask = RemoveScrollFromJs(ids);
 
         if (resizeValueTask.IsCompleted is false)
         {
@@ -225,4 +236,19 @@ public async ValueTask DisposeAsync()
 
         await Task.WhenAll(toAwait);
     }
+
+    public async ValueTask DisposeAsync()
+    {
+        await DisposeAsync(true);
+
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual async ValueTask DisposeAsync(bool disposing)
+    {
+        if (disposing)
+        {
+            await RemoveAllEventHandlers();
+        }
+    }
 }
diff --git a/src/Butil/Demo/Bit.Butil.Demo.Core/Pages/VisualViewportPage.razor b/src/Butil/Demo/Bit.Butil.Demo.Core/Pages/VisualViewportPage.razor
@@ -1,4 +1,5 @@
 @page "/visualViewport"
+@implements IAsyncDisposable
 @inject Bit.Butil.Console console
 @inject Bit.Butil.VisualViewport visualViewport
 
@@ -113,4 +114,9 @@
         var scale = await visualViewport.GetScale();
         await console.Log("Scale:", scale);
     }
+
+    public async ValueTask DisposeAsync()
+    {
+        await visualViewport.DisposeAsync();
+    }
 }