From 99b5837595a996f5178f183cbe63684d4307ce7d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 19 Apr 2026 14:43:30 +0800
Subject: [PATCH] feat(Select): use DynamicElement ensure release event
 callback

---
 .../Components/Select/Select.razor            |  9 ++++---
 .../Components/Select/Select.razor.cs         | 25 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Select/Select.razor b/src/BootstrapBlazor/Components/Select/Select.razor
index 47a5358528d..ff5d5ec8c4b 100644
--- a/src/BootstrapBlazor/Components/Select/Select.razor
+++ b/src/BootstrapBlazor/Components/Select/Select.razor
@@ -1,4 +1,4 @@
-@namespace BootstrapBlazor.Components
+@namespace BootstrapBlazor.Components
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @typeparam TValue
 @inherits SimpleSelectBase<TValue>
@@ -22,7 +22,8 @@
             }
             else
             {
-                <input type="text" id="@InputId" disabled="@Disabled" placeholder="@PlaceHolder" class="@InputClassString" value="@SelectedRow?.Text" @onchange="OnChange" readonly="@ReadonlyString" />
+                <input type="text" id="@InputId" disabled="@Disabled" placeholder="@PlaceHolder" class="@InputClassString"
+                       value="@SelectedRow?.Text" @onchange="@_onChangeEventCallback" readonly="@ReadonlyString" />
             }
             <span class="@AppendClassString"><i class="@DropdownIcon"></i></span>
         </div>
@@ -92,7 +93,7 @@
 
 @code {
     RenderFragment<SelectedItem> RenderRow => item =>
-    @<div class="@ActiveItem(item)" @onclick="() => OnClickItem(item)">
+    @<DynamicElement class="@ActiveItem(item)" OnClick="() => OnClickItem(item)">
         @if (ItemTemplate != null)
         {
             @ItemTemplate(item)
@@ -105,7 +106,7 @@
         {
             @item.Text
         }
-    </div>;
+    </DynamicElement>;
 
     RenderFragment<PlaceholderContext> RenderPlaceHolderRow => context =>
     @<div class="dropdown-item">
diff --git a/src/BootstrapBlazor/Components/Select/Select.razor.cs b/src/BootstrapBlazor/Components/Select/Select.razor.cs
index 751cecd22a3..9461ff45095 100644
--- a/src/BootstrapBlazor/Components/Select/Select.razor.cs
+++ b/src/BootstrapBlazor/Components/Select/Select.razor.cs
@@ -202,6 +202,8 @@ public bool IsUseActiveWhenValueIsNull
 
     private string _defaultVirtualizedItemText = "";
 
+    private EventCallback<ChangeEventArgs> _onChangeEventCallback = EventCallback<ChangeEventArgs>.Empty;
+
     private SelectedItem? SelectedItem { get; set; }
 
     private SelectedItem? SelectedRow
@@ -234,6 +236,10 @@ protected override void OnParametersSet()
         NoSearchDataText ??= Localizer[nameof(NoSearchDataText)];
         DropdownIcon ??= IconTheme.GetIconByKey(ComponentIcons.SelectDropdownIcon);
         ClearIcon ??= IconTheme.GetIconByKey(ComponentIcons.SelectClearIcon);
+
+        _onChangeEventCallback = IsEditable
+            ? EventCallback.Factory.Create<ChangeEventArgs>(this, OnChange)
+            : EventCallback<ChangeEventArgs>.Empty;
     }
 
     /// <summary>
@@ -389,6 +395,8 @@ private async Task OnClickItem(SelectedItem item)
             _defaultVirtualizedItemText = item.Text;
             await SelectedItemChanged(item);
         }
+
+        StateHasChanged();
     }
 
     private async Task SelectedItemChanged(SelectedItem item)
@@ -494,11 +502,26 @@ private async Task OnChange(ChangeEventArgs args)
         // 修复：使用完整的未过滤列表来查找当前选中项
         // 避免在用户搜索时被外部 StateHasChanged 影响导致值被错误修改
         var allItems = GetRowsByItems();
-        
+
         var item = GetItemWithEnumValue()
             ?? allItems.Find(i => i.Value == CurrentValueAsString)
             ?? allItems.Find(i => i.Active)
             ?? allItems.Find(i => !i.IsDisabled);
         return item;
     }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <param name="disposing"></param>
+    /// <returns></returns>
+    protected override ValueTask DisposeAsync(bool disposing)
+    {
+        if (disposing)
+        {
+            _onChangeEventCallback = EventCallback<ChangeEventArgs>.Empty;
+        }
+
+        return base.DisposeAsync(disposing);
+    }
 }