🐛 fix(DataTable): adding or deleting items doesn't refresh the table

masastack · Jul 2, 2024 · 321d96e · 321d96e
1 parent e6cd691
commit 321d96e
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/Masa.Blazor/Components/Data/MData.cs b/src/Masa.Blazor/Components/Data/MData.cs
@@ -339,7 +339,7 @@ protected override void RegisterWatchers(PropertyWatcher watcher)
     private bool _prevDisableFiltering;
     private int _prevServerItemsLength;
     private IEnumerable<ItemValue<TItem>>? _prevItemValues;
-    private IEnumerable<TItem>? _prevItems;
+    private HashSet<TItem>? _prevItems;
     private string? _prevSearch;
     private int _prevPageCount;
 
@@ -359,7 +359,7 @@ private void CheckForUpdates()
         needUpdateComputedItems |= CheckAndUpdate(ref _prevServerItemsLength, ServerItemsLength);
         needUpdateComputedItems |= CheckAndUpdate(ref _prevDisableFiltering, DisableFiltering);
         needUpdateComputedItems |= CheckAndUpdate(ref _prevItemValues, ItemValues);
-        needUpdateComputedItems |= CheckAndUpdate(ref _prevItems, Items);
+        needUpdateComputedItems |= CheckItemsAndUpdate(ref _prevItems, Items);
         needUpdateComputedItems |= CheckAndUpdate(ref _prevSearch, Search);
 
         if (needUpdateComputedItems)
@@ -376,6 +376,26 @@ private bool CheckAndUpdate<T>(ref T prevValue, T currentValue)
         return true;
     }
 
+    private bool CheckItemsAndUpdate<T>(ref HashSet<T>? prevValue, IEnumerable<T>? currentValue)
+    {
+        if (prevValue == null && currentValue == null) return false;
+        if (prevValue == null || currentValue == null)
+        {
+            prevValue = currentValue != null ? [..currentValue] : null;
+            return true;
+        }
+
+        var currentSet = new HashSet<T>(currentValue);
+
+        if (!prevValue.SetEquals(currentSet))
+        {
+            prevValue = currentSet;
+            return true;
+        }
+
+        return false;
+    }
+
     protected IList<TValue> WrapperInArray<TValue>(OneOf<TValue, IList<TValue>> val)
     {
         if (val.Value == null)