From 8a149efc21204bcf2e751895a8c0f581ef207e40 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 1 Jul 2025 13:13:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AA=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=20OnCloseAsync=20=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Dialog/Dialog.razor.cs            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
index efca43cdadc..679fd8a1b22 100644
--- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
@@ -23,7 +23,7 @@ public partial class Dialog : IDisposable
     [NotNull]
     private Func<Task>? _onCloseAsync = null;
 
-    private readonly Dictionary<Dictionary<string, object>, (bool IsKeyboard, bool IsBackdrop)> DialogParameters = [];
+    private readonly Dictionary<Dictionary<string, object>, (bool IsKeyboard, bool IsBackdrop, Func<Task>? OnCloseCallback)> DialogParameters = [];
     private Dictionary<string, object>? _currentParameter;
     private bool _isKeyboard = false;
     private bool _isBackdrop = false;
@@ -72,16 +72,14 @@ private async Task Show(DialogOption option)
 
         _onCloseAsync = async () =>
         {
-            // Callback OnCloseAsync
-            if (option.OnCloseAsync != null)
-            {
-                await option.OnCloseAsync();
-            }
-
             // Remove current DialogParameter
             if (_currentParameter != null)
             {
-                DialogParameters.Remove(_currentParameter);
+                DialogParameters.Remove(_currentParameter, out var v);
+                if (v.OnCloseCallback != null)
+                {
+                    await v.OnCloseCallback();
+                }
 
                 // Support for multiple dialogs
                 var p = DialogParameters.LastOrDefault();
@@ -162,7 +160,7 @@ private async Task Show(DialogOption option)
         _currentParameter = parameters;
 
         // Add ModalDialog to the container
-        DialogParameters.Add(parameters, (_isKeyboard, _isBackdrop));
+        DialogParameters.Add(parameters, (_isKeyboard, _isBackdrop, option.OnCloseAsync));
         await InvokeAsync(StateHasChanged);
     }
 

From 74bf5f0cb26a64ce84602565701faff39c1cf469 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 1 Jul 2025 13:14:22 +0800
Subject: [PATCH 2/2] chore: bump version 9.8.0

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 498b9a5fc30..ec2a6eb5a4e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.8.0-beta07</Version>
+    <Version>9.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>