[DataGrid] changes related to loading behavior

Directory.Packages.props

@@ -10,8 +10,8 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- For Sample Apps -->
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.0" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.10.0" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.1" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.10.1" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
     <!-- Test dependencies -->
     <PackageVersion Include="bunit" Version="1.31.3" />
@@ -65,4 +65,4 @@
     <PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
     <PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
   </ItemGroup>
-</Project>
+</Project>

examples/Demo/Shared/FluentUI.Demo.Shared.csproj

@@ -39,7 +39,7 @@
 	<ItemGroup>
 		<PackageReference Include="Markdig.Signed" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" />
 	</ItemGroup>
 

examples/Demo/Shared/Pages/DataGrid/Examples/DataGridRemoteData.razor

@@ -4,7 +4,7 @@
 @inject NavigationManager NavManager
 
 <div style="height: 434px; overflow:auto;" tabindex="-1">
-    <FluentDataGrid Loading="@(numResults == 0)" ItemsProvider="foodRecallProvider" OnRowDoubleClick="@(()=>DemoLogger.WriteLine("Row double clicked!"))" Virtualize="true" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="FoodRecall" >
+    <FluentDataGrid style="height: 100%;" Loading="@(numResults == null)" ItemsProvider="foodRecallProvider" OnRowDoubleClick="@(()=>DemoLogger.WriteLine("Row double clicked!"))" Virtualize="true" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="FoodRecall" >
         <PropertyColumn Title="ID" Property="@(c => c!.Event_Id)" />
         <PropertyColumn Property="@(c => c!.State)" Style="color: #af5f00 ;" />
         <PropertyColumn Property="@(c => c!.City)" />
@@ -21,7 +21,7 @@
 
 @code {
     GridItemsProvider<FoodRecall> foodRecallProvider = default!;
-    int numResults;
+    int? numResults;
 
     protected override async Task OnInitializedAsync()
     {

examples/Demo/Shared/Pages/Lab/IssueTester.razor

@@ -1,2 +1,5 @@
-@page "/issue-tester"
+
+@using FluentUI.Demo.Shared.Pages.DataGrid.Examples
 
+
+<DataGridNotVirtualizedLoadingAndEmpty />

examples/Demo/Shared/Pages/Lab/IssueTesterPage.razor

@@ -0,0 +1,11 @@
+@page "/issue-tester"
+<PageTitle>@App.PageTitle("Lab Overview")</PageTitle>
+
+<h1><FluentIcon Value="@(new Icons.Regular.Size24.WrenchScrewdriver())" />Issue Tester</h1>
+
+
+<DemoSection Component="typeof(IssueTester)" Title="Testbed for issues reported on GH" />
+
+@code {
+
+}

examples/Demo/Shared/Pages/Lab/LabOverviewPage.razor

@@ -10,7 +10,7 @@
     them to your project in an easy way. Some might even end up in the trashcan.
 </p>
 <p>
-    As these components are not part of the official library, they are not included in the NuGet package. Also, please note that we only 
+    As these components are not part of the official library, they are not included in the NuGet package. Same as with the rest of the library, we only 
     offer support for these specific components through the <a href="https://github.com/microsoft/fluentui-blazor/">GitHub repository</a> on a best effort base.
     <br />
     We hope you will help us test-drive the components, both here in the demo environment but also in your own projects, and give us 
@@ -34,14 +34,13 @@
     <ul>
         <li>MarkdownSection depends on external package <code>Markdig</code>. We do not intend to add components to the library that have external dependencies</li>
         <li>
-            TableOfContents needs to be refreshed if other components (like for example a <code>MarkdownSection</code>) add headings into the DOM. This is possible
-            but requires a fair ammount of steps we can not automate. We thefore choose to make a sample implementation available in the lab. 
+            TableOfContents needs to be refreshed if other components (like for example a <code>MarkdownSection</code>) add headings into the DOM. This is
+            possible but requires a fair ammount of steps we can not automate. We therefore choose to make a sample implementation available in the lab.
             The TableOfContents page explains and shows the steps needed to make this work.
         </li>
     </ul>
 </p>
 
-<DemoSection Component="typeof(IssueTester)" Title="Testbed for issues reported on GH" />
 
 @code {
     [Parameter]

examples/Demo/Shared/Shared/DemoNavProvider.cs

@@ -574,7 +574,11 @@ public DemoNavProvider()
                         icon: new Icons.Regular.Size20.DocumentTextLink(),
                         title: "TableOfContents"
                     ),
-
+                    new NavLink(
+                        href: "/issue-tester",
+                        icon: new Icons.Regular.Size20.WrenchScrewdriver(),
+                        title: "Issue Tester"
+                    ),
                 ]
             )
         ];

src/Core/Components/DataGrid/FluentDataGrid.razor

@@ -81,7 +81,6 @@
         var rowIndex = initialRowIndex;
         if (_internalGridContext.Items.Any())
         {
-            Loading = false;
             foreach (var item in _internalGridContext.Items)
             {
                 RenderRow(__builder, rowIndex++, item);
@@ -97,7 +96,6 @@
     {
         var rowClass = RowClass?.Invoke(item) ?? null;
         var rowStyle = RowStyle?.Invoke(item) ?? null;
-        Loading = false;
         <FluentDataGridRow @key="@(ItemKey(item))" GridTemplateColumns=@_internalGridTemplateColumns aria-rowindex="@rowIndex" Class="@rowClass" Style="@rowStyle" TGridItem="TGridItem" Item="@item">
             @for (var colIndex = 0; colIndex < _columns.Count; colIndex++)
             {

src/Core/Components/DataGrid/FluentDataGrid.razor.cs

@@ -728,8 +728,6 @@ private async ValueTask<GridItemsProviderResult<TGridItem>> ResolveItemsRequestA
         {
             // No-op; we canceled the operation, so it's fine to suppress this exception.
         }
-
-        Loading = false;
         return GridItemsProviderResult.From(Array.Empty<TGridItem>(), 0);
     }