diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 0727d740..697deba8 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -50,6 +50,7 @@ let hasMore = $state(true) async function loadMore() { + console.log(hasMore, loading) if (!hasMore || loading) return try { @@ -255,7 +256,14 @@ {/if} - + { + console.log('loadMore triggered') + loadMore() + }} + /> {/if} {@render children?.()} diff --git a/src/lib/components/render/VirtualList.svelte b/src/lib/components/render/VirtualList.svelte index 6a207985..7d6d6848 100644 --- a/src/lib/components/render/VirtualList.svelte +++ b/src/lib/components/render/VirtualList.svelte @@ -1,7 +1,7 @@ { if (type) settings.defaultSort.feed = type @@ -63,8 +63,8 @@ data.feed, v => (postFeeds.value.main.data = v)} + bind:posts={data.feed.value.posts.posts} + bind:feedData={() => data.feed.value, v => (postFeeds.value.main.data = v)} feedId="main" /> typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`} back={false} diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 4598836e..c326a0d2 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,5 +1,6 @@ import { t } from '$lib/i18n/translations.js' import { postFeed } from '$lib/lemmy/postfeed.svelte.js' +import { ReactiveState } from '$lib/promise.svelte.js' import { settings } from '$lib/settings.svelte' import type { ListingType, SortType } from 'lemmy-js-client' import { ChevronDoubleUp } from 'svelte-hero-icons' @@ -13,18 +14,20 @@ export async function load({ url, fetch }) { (url.searchParams.get('type') as ListingType) || settings.defaultSort.feed return { - feed: await postFeed({ - id: 'main', - request: { - page_cursor: cursor, - sort: sort, - type_: listingType, - limit: 20, - show_hidden: settings.posts.showHidden, - }, - url: url, - fetch: fetch, - }), + feed: new ReactiveState( + await postFeed({ + id: 'main', + request: { + page_cursor: cursor, + sort: sort, + type_: listingType, + limit: 20, + show_hidden: settings.posts.showHidden, + }, + url: url, + fetch: fetch, + }), + ), contextual: { actions: [ {