Skip to content
This repository was archived by the owner on Jul 10, 2024. It is now read-only.

Fix pager for empty table. #387

Open
Drake53 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix pager for empty table. #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/BlazorTable/Components/Pager.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
</li>
}

<li class="page-item @(Table.PageNumber == 0 ? "disabled": "")" @onclick="@(() => Table.FirstPageAsync())" title="@Localization["PagerFirst"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber == 0 ? "true": null)">@Localization["PagerFirst"]</a>
<li class="page-item @(Table.PageNumber <= 0 ? "disabled": "")" @onclick="@(() => Table.FirstPageAsync())" title="@Localization["PagerFirst"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber <= 0 ? "true": null)">@Localization["PagerFirst"]</a>
</li>
<li class="page-item @(Table.PageNumber == 0 ? "disabled": "")" @onclick="@(() => Table.PreviousPageAsync())" title="@Localization["PagerPrevious"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber == 0 ? "true": null)">@Localization["PagerPrevious"]</a>
<li class="page-item @(Table.PageNumber <= 0 ? "disabled": "")" @onclick="@(() => Table.PreviousPageAsync())" title="@Localization["PagerPrevious"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber <= 0 ? "true": null)">@Localization["PagerPrevious"]</a>
</li>
<li class="page-item @(Table.PageNumber + 1 < Table.TotalPages ? "" : "disabled")" @onclick="@(() => Table.NextPageAsync())" title="@Localization["PagerNext"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber + 1 < Table.TotalPages ? null: "true")">@Localization["PagerNext"]</a>
</li>
<li class="page-item @(Table.PageNumber + 1 != Table.TotalPages ? "" : "disabled")" @onclick="@(() => Table.LastPageAsync())" title="@Localization["PagerLast"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber + 1 != Table.TotalPages ? null : "true")">@Localization["PagerLast"]</a>
<li class="page-item @(Table.PageNumber + 1 < Table.TotalPages ? "" : "disabled")" @onclick="@(() => Table.LastPageAsync())" title="@Localization["PagerLast"]">
<a class="page-link" href="javascript:;" aria-disabled="@(Table.PageNumber + 1 < Table.TotalPages ? null : "true")">@Localization["PagerLast"]</a>
</li>
</ul>
</div>
Expand Down
17 changes: 12 additions & 5 deletions src/BlazorTable/Components/Table.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,14 @@ private IEnumerable<TableItem> GetData()
}

// if the current page is filtered out, we should go back to a page that exists
if (PageNumber > TotalPages)
if (PageNumber >= TotalPages)
{
PageNumber = TotalPages - 1;
}
else if (PageNumber < 0 && TotalPages > 0)
{
PageNumber = 0;
}

// if PageSize is zero, we return all rows and no paging
return PageSize <= 0 ? ItemsQueryable.ToList() : ItemsQueryable.Skip(PageNumber * PageSize).Take(PageSize).ToList();
Expand Down Expand Up @@ -292,7 +296,7 @@ public void RemoveColumn(IColumn<TableItem> column)
/// </summary>
public async Task FirstPageAsync()
{
if (PageNumber != 0)
if (PageNumber > 0)
{
PageNumber = 0;
detailsViewOpen.Clear();
Expand Down Expand Up @@ -331,9 +335,12 @@ public async Task PreviousPageAsync()
/// </summary>
public async Task LastPageAsync()
{
PageNumber = TotalPages - 1;
detailsViewOpen.Clear();
await UpdateAsync().ConfigureAwait(false);
if (PageNumber + 1 < TotalPages)
{
PageNumber = TotalPages - 1;
detailsViewOpen.Clear();
await UpdateAsync().ConfigureAwait(false);
}
}

/// <summary>
Expand Down