Skip to content

Commit

Permalink
remove CollectionView
Browse files Browse the repository at this point in the history
  • Loading branch information
@rwecho
rwecho committed Apr 3, 2024
1 parent 2e7a3cb commit 8ab8f75
Show file tree
Hide file tree
Showing 11 changed files with 530 additions and 665 deletions.
100 changes: 0 additions & 100 deletions src/V2ex.Blazor.Shared/Components/CollectionView.razor
View file

This file was deleted.

36 changes: 0 additions & 36 deletions src/V2ex.Blazor.Shared/Components/CollectionView.razor.js
View file

This file was deleted.

21 changes: 21 additions & 0 deletions src/V2ex.Blazor.Shared/Components/ScrollView.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@
[Parameter]
public EventCallback<ScrollEventArgs> OnScrollCallback { get; set; }

[Parameter]
public EventCallback RemainingReachedCallback { get; set; }

[Parameter]
public int RemainingHeight { get; set; } = 100;

[Inject]
private IJSRuntime JsRuntime { get; set; } = null!;
private ElementReference? containerRef;
private DotNetObjectReference<ScrollView>? thisRef;
private IJSObjectReference? module;
private double lastScrollHeight;


protected override void OnInitialized()
{
Expand Down Expand Up @@ -45,5 +53,18 @@
public async Task OnScrollAsync(double scrollTop, double scrollHeight, double clientHeight)
{
await this.OnScrollCallback.InvokeAsync(new ScrollEventArgs(scrollTop, scrollHeight, clientHeight));

if (scrollHeight != lastScrollHeight)
{
// the elements in the container have changed, so the scroll bar will change
lastScrollHeight = scrollHeight;
return;
}

var heightToBottom = scrollHeight - scrollTop - clientHeight;
if (heightToBottom < RemainingHeight)
{
await this.RemainingReachedCallback.InvokeAsync();
}
}
}
34 changes: 18 additions & 16 deletions src/V2ex.Blazor.Shared/Pages/FavoriteFollowing.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
@if (viewModel != null && viewModel.Topics.Count > 0)
{
<LoadingBox Load="()=> LoadAsync(1)">
<CollectionView TItem="TopicViewModel" Items="viewModel.Topics" RemainingReachedCallback="OnRemainingReached">
<ItemContent Context="item">
<Topic ViewModel="item"></Topic>
</ItemContent>
<Footer>
@if (viewModel.CurrentPage == viewModel.MaximumPage)
<ScrollView RemainingReachedCallback="OnRemainingReached">
@{
<div class="grid grid-cols-1 divide-y">
@foreach(var topic in viewModel.Topics)
{
<Topic ViewModel="topic"></Topic>
}
</div>

if(viewModel.CurrentPage == viewModel.MaximumPage)
{
<div class="flex flex-col items-center text-gray-400 text-sm mt-4 pb-10">
<div>全部加载完成</div>
Expand All @@ -22,22 +26,20 @@
<div class="flex flex-row place-content-center items-center text-gray-400 text-sm mt-4 pb-10 space-x-2">
<div role="status">
<svg aria-hidden="true"
class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="sr-only">Loading...</span>
</div>
<div>加载中...</div>
</div>
}
</Footer>
</CollectionView>
}
</ScrollView>
</LoadingBox>
}
else
Expand Down
56 changes: 28 additions & 28 deletions src/V2ex.Blazor.Shared/Pages/FavoriteTopics.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@
<RefreshView Refresh="OnRefreshAsync">
@if(viewModel != null && viewModel.Topics.Count > 0)
{
<CollectionView TItem="TopicViewModel" Items="viewModel.Topics" RemainingReachedCallback="OnRemainingReached">
<ItemContent Context="item">
<Topic ViewModel="item"></Topic>
</ItemContent>
<Footer>
@if (viewModel.CurrentPage == viewModel.MaximumPage)
<ScrollView RemainingReachedCallback="OnRemainingReached">
<div class="grid grid-cols-1 divide-y">
@foreach(var topic in viewModel.Topics)
{
<div class="flex flex-col items-center text-gray-400 text-sm mt-4 pb-10">
<div>全部加载完成</div>
</div>
<Topic ViewModel="topic"></Topic>
}
else
{
<div class="flex flex-row place-content-center items-center text-gray-400 text-sm mt-4 pb-10 space-x-2">
<div role="status">
<svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="sr-only">Loading...</span>
</div>
<div>加载中...</div>
</div>

@if(viewModel.CurrentPage == viewModel.MaximumPage)
{
<div class="flex flex-col items-center text-gray-400 text-sm mt-4 pb-10">
<div>全部加载完成</div>
</div>
}
else
{
<div class="flex flex-row place-content-center items-center text-gray-400 text-sm mt-4 pb-10 space-x-2">
<div role="status">
<svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="sr-only">Loading...</span>
</div>
}
</Footer>
</CollectionView>
<div>加载中...</div>
</div>
}
</ScrollView>
}
else
{
Expand Down
56 changes: 28 additions & 28 deletions src/V2ex.Blazor.Shared/Pages/NodePage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
@if (viewModel != null)
{
<RefreshView Refresh="OnRefresh">
<CollectionView TItem="TopicViewModel" Items="viewModel.Topics" RemainingReachedCallback="OnRemainingReached">
<ItemContent Context="item">
<Topic ViewModel="item"></Topic>
</ItemContent>
<Footer>
@if (viewModel.CurrentPage == viewModel.MaximumPage)
<ScrollView RemainingReachedCallback="OnRemainingReached">
<div class="grid grid-cols-1 divide-y">
@foreach(var topic in viewModel.Topics)
{
<div class="flex flex-col items-center text-gray-400 text-sm mt-4 pb-10">
<div>全部加载完成</div>
</div>
<Topic ViewModel="topic"></Topic>
}
else
{
<div class="flex flex-row place-content-center items-center text-gray-400 text-sm mt-4 pb-10 space-x-2">
<div role="status">
<svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="sr-only">Loading...</span>
</div>
<div>加载中...</div>
</div>

@if(viewModel.CurrentPage == viewModel.MaximumPage)
{
<div class="flex flex-col items-center text-gray-400 text-sm mt-4 pb-10">
<div>全部加载完成</div>
</div>
}
else
{
<div class="flex flex-row place-content-center items-center text-gray-400 text-sm mt-4 pb-10 space-x-2">
<div role="status">
<svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="sr-only">Loading...</span>
</div>
}
</Footer>
</CollectionView>
<div>加载中...</div>
</div>
}
</ScrollView>
</RefreshView>
}
@code {
Expand Down
Loading

0 comments on commit 8ab8f75

Please sign in to comment.