Fix #801 by removing direct call to Items.Count() (#831)

microsoft · Oct 6, 2023 · 497ee86 · 497ee86
1 parent 5d2b112
commit 497ee86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor b/src/Core/Components/DataGrid/FluentDataGrid.razor
@@ -29,7 +29,8 @@
                     @_renderColumnHeaders
                 </FluentDataGridRow>
             }
-            @if (Items?.Count() == 0 || _ariaBodyRowCount == 0)
+
+            @if (_ariaBodyRowCount == 0)
             {
                 <div class="empty-content">
                 @if (EmptyContent is null)

diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
@@ -409,6 +409,7 @@ private async ValueTask<GridItemsProviderResult<TGridItem>> ResolveItemsRequestA
         else if (Items is not null)
         {
             int totalItemCount = _asyncQueryExecutor is null ? Items.Count() : await _asyncQueryExecutor.CountAsync(Items);
+            _ariaBodyRowCount = totalItemCount;
             IQueryable<TGridItem>? result = request.ApplySorting(Items).Skip(request.StartIndex);
             if (request.Count.HasValue)
             {