fix(blazor): remove sync dispose

sitkoru · Dec 6, 2023 · c880db5 · c880db5
1 parent c397acc
commit c880db5
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/src/Sitko.Core.Blazor/Components/BaseComponent.cs b/src/Sitko.Core.Blazor/Components/BaseComponent.cs
@@ -15,7 +15,7 @@ public interface IBaseComponent
     Task NotifyStateChangeAsync();
 }
 
-public abstract class BaseComponent : ComponentBase, IAsyncDisposable, IDisposable
+public abstract class BaseComponent : ComponentBase, IAsyncDisposable
 {
     private static readonly FieldInfo? RenderFragment = typeof(ComponentBase).GetField("_renderFragment",
         BindingFlags.NonPublic | BindingFlags.Instance);
@@ -120,29 +120,18 @@ public async ValueTask DisposeAsync()
         if (!isDisposed)
         {
             NavigationManager.LocationChanged -= HandleLocationChanged;
+            Dispose(true);
+            await DisposeAsync(true);
             if (scope is not null)
             {
                 await scope.Value.DisposeAsync();
             }
 
-            Dispose(true);
-            await DisposeAsync(true);
             isDisposed = true;
             GC.SuppressFinalize(this);
         }
     }
 
-    public void Dispose()
-    {
-        if (!isDisposed)
-        {
-            throw new InvalidOperationException(
-                "This class must not be disposed synchronously. This method only here to avoid exception on sync scope dispose in .NET 5");
-        }
-
-        GC.SuppressFinalize(this);
-    }
-
     public override string ToString() => $"{GetType().Name} {ComponentId}";
 
     public Task NotifyStateChangeAsync() => InvokeAsync(StateHasChanged);
@@ -334,4 +323,3 @@ public enum ScopeType
 {
     Parent = 0, Isolated = 1
 }
-