Sync deleted items

Author: stsrki

Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs

@@ -1299,20 +1299,21 @@ public async Task Delete( TItem item )
         if ( Data is ICollection<TItem> data && await IsSafeToProceed( RowRemoving, item, item ) )
         {
             var itemIsSelected = SelectedRow.IsEqual( item );
+            var itemRemoved = false;
 
             if ( UseInternalEditing )
             {
                 if ( data.Contains( item ) )
                 {
                     data.Remove( item );
+                    itemRemoved = true;
 
                     lastKnownDataCount = Data?.Count() ?? 0;
                 }
 
-                if ( itemIsSelected )
+                if ( itemRemoved )
                 {
-                    SelectedRow = default;
-                    await SelectedRowChanged.InvokeAsync( SelectedRow );
+                    await SyncSelectedItemsWithData();
                 }
             }
 

Tests/BasicTestApp.Client/DataGridSelectedRowSyncComponent.razor

@@ -0,0 +1,54 @@
+<DataGrid TItem="Employee"
+          @ref="GridRef"
+          Data="@Items"
+          SelectionMode="DataGridSelectionMode.Single"
+          SelectedRow="@SelectedRow"
+          SelectedRowChanged="OnSelectedRowChanged"
+          Editable
+          UseInternalEditing>
+    <DataGridColumns>
+        <DataGridColumn TItem="Employee"
+                        Field="@nameof( Employee.Name )"
+                        Caption="Name" />
+    </DataGridColumns>
+</DataGrid>
+
+<Button ElementId="btnDelete" Color="Color.Danger" Clicked="DeleteSelected">Delete</Button>
+
+@code {
+    public class Employee
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+
+    public List<Employee> Items { get; set; } = new()
+    {
+        new() { Id = 1, Name = "John" },
+        new() { Id = 2, Name = "Sarah" },
+    };
+
+    public Employee SelectedRow { get; set; }
+
+    public int SelectedRowChangedCount { get; private set; }
+
+    public DataGrid<Employee> GridRef { get; set; }
+
+    private Task OnSelectedRowChanged( Employee selected )
+    {
+        SelectedRow = selected;
+        SelectedRowChangedCount++;
+        return Task.CompletedTask;
+    }
+
+    private Task DeleteSelected()
+    {
+        if ( SelectedRow is not null )
+        {
+            return GridRef.Delete( SelectedRow );
+        }
+
+        return Task.CompletedTask;
+    }
+}

Tests/Blazorise.Tests/Components/DataGridSelectedRowSyncComponentTest.cs

@@ -0,0 +1,41 @@
+#region Using directives
+using System.Threading.Tasks;
+using Bunit;
+using FluentAssertions;
+using Xunit;
+#endregion
+
+namespace Blazorise.Tests.Components;
+
+public class DataGridSelectedRowSyncComponentTest : TestContext
+{
+    public DataGridSelectedRowSyncComponentTest()
+    {
+        Services.AddBlazoriseTests().AddBootstrapProviders().AddEmptyIconProvider().AddTestData();
+        JSInterop.AddBlazoriseDataGrid();
+    }
+
+    [Fact]
+    public async Task Delete_Should_ClearSelectedRow_AndInvokeOnce()
+    {
+        var comp = RenderComponent<BasicTestApp.Client.DataGridSelectedRowSyncComponent>();
+
+        var rows = comp.FindAll( "tbody tr.table-row-selectable" );
+        await rows[0].ClickAsync();
+
+        comp.WaitForAssertion( () =>
+        {
+            comp.Instance.SelectedRow.Should().NotBeNull();
+            comp.Instance.SelectedRowChangedCount.Should().Be( 1 );
+        } );
+
+        await comp.Find( "#btnDelete" ).ClickAsync();
+
+        comp.WaitForAssertion( () =>
+        {
+            comp.Instance.Items.Should().HaveCount( 1 );
+            comp.Instance.SelectedRow.Should().BeNull();
+            comp.Instance.SelectedRowChangedCount.Should().Be( 2 );
+        } );
+    }
+}