fixed #588 [HxGrid] Data never gets loaded when using PlaceholdersRow…

…Count together with InfiniteScroll mode
havit · Oct 12, 2023 · 86945be · 86945be
1 parent e6258c5
commit 86945be
Showing 1 changed file with 57 additions and 57 deletions.
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Grids/HxGrid.razor b/Havit.Blazor.Components.Web.Bootstrap/Grids/HxGrid.razor
@@ -95,63 +95,6 @@
 					</tr>
 				</thead>
 				<tbody>
-					@if (shouldRenderLoadingData)
-					{
-						@if (shouldRenderLoadingDataWithPlaceholders)
-						{
-							int rowsToRender = PlaceholdersRowCountEffective;
-							int pageOffset = CurrentUserState.PageIndex * PageSizeEffective;
-
-							for (int i = 0; i < rowsToRender; i++)
-							{
-								GridPlaceholderCellContext placeholderContext = new GridPlaceholderCellContext { Index = pageOffset + i };
-								<tr>
-									@foreach (IHxGridColumn<TItem> column in columnsToRender)
-									{
-										GridCellTemplate placeholderCellTemplate = column.GetItemPlaceholderCellTemplate(placeholderContext);
-										<td @key="@column" class="@placeholderCellTemplate.CssClass">
-											@placeholderCellTemplate.Template
-										</td>
-									}
-								</tr>
-							}
-						}
-						else
-						{
-							<tr>
-								<td colspan="@columnsToRender.Count">
-									@if (shouldRenderLoadingDataWithLoadingTemplate)
-									{
-										@LoadingDataTemplate
-									}
-									else
-									{
-										<div class="text-center text-secondary my-5">
-											<div class="fs-3"><HxIcon Icon="@BootstrapIcon.InboxFill" /></div>
-											<div>@HxGridLocalizer["LoadingData"]</div>
-										</div>
-									}
-								</td>
-							</tr>
-						}
-					}
-					@if (shouldRenderEmptyData)
-					{
-						<tr class="hx-grid-empty-data-row">
-							<td colspan="@columnsToRender.Count">
-
-								@if (EmptyDataTemplate != null)
-								{
-									@EmptyDataTemplate
-								}
-								else
-								{
-									<HxGridEmptyDataTemplateDefaultContent />
-								}
-
-							</td>
-						</tr>
-					}
 					@if (shouldRenderData)
 					{
 
@@ -226,6 +169,63 @@
 						        @rowTemplate(item)
 					        }
 				        }
+						@if (shouldRenderLoadingData)
+						{
+							@if (shouldRenderLoadingDataWithPlaceholders)
+							{
+								int rowsToRender = PlaceholdersRowCountEffective;
+								int pageOffset = CurrentUserState.PageIndex * PageSizeEffective;
+
+								for (int i = 0; i < rowsToRender; i++)
+								{
+									GridPlaceholderCellContext placeholderContext = new GridPlaceholderCellContext { Index = pageOffset + i };
+									<tr>
+										@foreach (IHxGridColumn<TItem> column in columnsToRender)
+										{
+											GridCellTemplate placeholderCellTemplate = column.GetItemPlaceholderCellTemplate(placeholderContext);
+											<td @key="@column" class="@placeholderCellTemplate.CssClass">
+												@placeholderCellTemplate.Template
+											</td>
+										}
+									</tr>
+								}
+							}
+							else
+							{
+								<tr>
+									<td colspan="@columnsToRender.Count">
+										@if (shouldRenderLoadingDataWithLoadingTemplate)
+										{
+											@LoadingDataTemplate
+										}
+										else
+										{
+											<div class="text-center text-secondary my-5">
+												<div class="fs-3"><HxIcon Icon="@BootstrapIcon.InboxFill" /></div>
+												<div>@HxGridLocalizer["LoadingData"]</div>
+											</div>
+										}
+									</td>
+								</tr>
+							}
+						}
+						@if (shouldRenderEmptyData)
+						{
+							<tr class="hx-grid-empty-data-row">
+								<td colspan="@columnsToRender.Count">
+
+									@if (EmptyDataTemplate != null)
+									{
+										@EmptyDataTemplate
+									}
+									else
+									{
+										<HxGridEmptyDataTemplateDefaultContent />
+									}
+
+								</td>
+							</tr>
+						}
 			        }
 				</tbody>
 				@{