🐛 fix: Optimize the logic of component disposing (#1745)

masastack · Jan 31, 2024 · fdac246 · fdac246
1 parent 0d98881
commit fdac246
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/docs/Masa.Blazor.Docs/Components/Examples/Example.razor.cs b/docs/Masa.Blazor.Docs/Components/Examples/Example.razor.cs
@@ -303,9 +303,9 @@ private static List<RazorExtension> GetRazorExtension()
             .Cast<RazorExtension>().ToList();
     }
 
-    protected override ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsyncCore()
     {
         _objRef?.Dispose();
-        return base.DisposeAsync(disposing);
+        return base.DisposeAsyncCore();
     }
 }
diff --git a/docs/Masa.Docs.Shared/Shared/Toc.razor.cs b/docs/Masa.Docs.Shared/Shared/Toc.razor.cs
@@ -92,9 +92,9 @@ private string GenClass(MarkdownItTocContent tocContent)
         return builder.ToString();
     }
 
-    protected override ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsyncCore()
     {
         AppService.TocChanged -= AppServiceOnTocChanged;
-        return base.DisposeAsync(disposing);
+        return base.DisposeAsyncCore();
     }
 }
diff --git a/docs/Masa.Docs.Shared/wwwroot/locale/en-US.json b/docs/Masa.Docs.Shared/wwwroot/locale/en-US.json
@@ -12,6 +12,7 @@
   "upgrade-guide": "Upgrade guide",
   "contributing": "Contributing",
   "styles-and-animations": "Styles and animations",
+  "ui-components": "Components",
   "features": "Features",
   "border-radius": "Border radius",
   "color": "Colors",

diff --git a/src/Masa.Blazor.SomethingSkia/Watermark/MWatermark.razor.cs b/src/Masa.Blazor.SomethingSkia/Watermark/MWatermark.razor.cs
@@ -255,9 +255,9 @@ private string ConvertBitmapToBase64(SKBitmap bitmap)
         return Convert.ToBase64String(imageBytes);
     }
 
-    protected override ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsyncCore()
     {
         _originalBitmap?.Dispose();
-        return base.DisposeAsync(disposing);
+        return base.DisposeAsyncCore();
     }
 }
diff --git a/src/Masa.Try.Shared/Pages/Index.razor.cs b/src/Masa.Try.Shared/Pages/Index.razor.cs
@@ -298,10 +298,10 @@ private void ClearInputs()
         _newScriptContent = string.Empty;
     }
 
-    protected override ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsyncCore()
     {
         _objRef?.Dispose();
-        return base.DisposeAsync(disposing);
+        return base.DisposeAsyncCore();
     }
 
     [GeneratedRegex("(<script(.*?)>)(.|\n)*?(</script>)")]