From 897a3c363cb13629549156512ee416e85bd182c6 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 8 Mar 2025 13:06:17 -0800 Subject: [PATCH] cleanup: switch to state-based post feeds --- .../components/lemmy/comment/Comment.svelte | 5 -- .../components/lemmy/comment/Comments.svelte | 1 + .../components/lemmy/post/PostActions.svelte | 2 +- src/lib/components/lemmy/post/PostVote.svelte | 2 +- .../lemmy/post/feed/VirtualFeed.svelte | 61 +++++++++---------- .../lemmy/{postfeed.ts => postfeed.svelte.ts} | 44 ++++++------- src/routes/+page.svelte | 12 ++-- src/routes/+page.ts | 33 ++++++---- src/routes/c/[name]/+page.ts | 2 +- src/routes/profile/voted/[type]/+page.ts | 2 +- 10 files changed, 79 insertions(+), 85 deletions(-) rename src/lib/lemmy/{postfeed.ts => postfeed.svelte.ts} (65%) diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index 3c186ac0..560102cd 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -56,11 +56,6 @@ open = $bindable(true), }: Props = $props() - // TODO this kinda sucks because you cant bind:, but we need to save the open state for the virtualizer - $effect(() => { - node.expanded = open - }) - let editing = $state(false) let newComment = $state(node.comment_view.comment.content) let editingLoad = $state(false) diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index 6da7f675..2fb726af 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -121,6 +121,7 @@ node.comment_view.counts.child_count > 0 ? 'border-l' : ''} ml-2.5 border-slate-200 dark:border-zinc-800 pl-2.5 " + bind:open={() => node.expanded, (value) => (node.expanded = value)} > {#if node.children?.length > 0} diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index d0e83119..72f2b2fe 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -119,7 +119,7 @@ {style} > { - $virtualizer.scrollToIndex($postFeeds[feedId]?.lastSeen ?? 0) + $virtualizer.scrollToIndex(postFeeds.value[feedId]?.lastSeen ?? 0) }) interface Props { @@ -94,9 +94,7 @@ feedData.cursor.next = newPosts.next_page feedData.posts.posts = [...feedData.posts.posts, ...newPosts.posts] - postFeeds.updateFeed(feedId, { - data: feedData, - }) + postFeeds.value[feedId].data = feedData loading = false } catch (e) { @@ -114,9 +112,8 @@ if (!id) return - postFeeds.updateFeed(feedId, { - lastSeen: Number(id), - }) + postFeeds.value[feedId].lastSeen = Number(id) + observer.unobserve(element) }) } @@ -164,10 +161,12 @@ }) let items = $derived($virtualizer.getVirtualItems()) + $effect(() => { if (virtualItemEls.length) virtualItemEls.forEach($virtualizer.measureElement) }) + $effect(() => { if (posts.length && virtualListEl) $virtualizer.setOptions({ @@ -209,30 +208,28 @@ id="feed" > {#each items as row, index (posts[row.index]?.post.id)} - {#if posts[row.index]} -
  • - { - posts = posts.toSpliced(row.index, 1) - }} - > -
  • - {/if} +
  • + { + posts = posts.toSpliced(row.index, 1) + }} + > +
  • {/each} diff --git a/src/lib/lemmy/postfeed.ts b/src/lib/lemmy/postfeed.svelte.ts similarity index 65% rename from src/lib/lemmy/postfeed.ts rename to src/lib/lemmy/postfeed.svelte.ts index 919d02b1..573e3e7a 100644 --- a/src/lib/lemmy/postfeed.ts +++ b/src/lib/lemmy/postfeed.svelte.ts @@ -7,7 +7,6 @@ import type { ListingType, SortType, } from 'lemmy-js-client' -import { get, writable } from 'svelte/store' export const shouldReload = ( cache: PostFeed | undefined, @@ -30,14 +29,15 @@ export async function postFeed(args: { init?: RequestInit | undefined, ) => Promise }) { - const feed = get(postFeeds)[args.id] + const feed = postFeeds.value[args.id] const posts = shouldReload(feed, args.url, instance.data) ? await client({ func: args.fetch }).getPosts(args.request) : feed.data.posts if (shouldReload(feed, args.url, instance.data) && browser) - postFeeds.updateFeed(args.id, { + postFeeds.value[args.id] = { + id: args.id, data: { ...args.request, posts: posts, @@ -49,10 +49,10 @@ export async function postFeed(args: { url: args.url, lastSeen: 0, instance: instance.data, - }) + } return ( - get(postFeeds)[args.id]?.data ?? { + postFeeds.value[args.id]?.data ?? { ...args.request, posts: posts, cursor: { @@ -67,28 +67,18 @@ export function getPostFeed(feeds: Map, id: PostFeedID) { return feeds.get(id) } -function createPostFeedsStore() { - // @ts-ignore - const { subscribe, update, set } = writable>({}) +class PostFeedState { + #value: Record = $state({}) as Record< + PostFeedID, + PostFeed + > - return { - subscribe, - addFeed: (id: PostFeedID, feed: PostFeed) => - update((feeds) => ({ ...feeds, [id]: feed })), - updateFeed: (id: PostFeedID, feed: Partial) => - update((feeds) => { - return { - ...feeds, - [id]: { ...feeds[id], ...feed } as PostFeed, - } - }), - removeFeed: (id: PostFeedID) => - update((feeds) => { - const { [id]: _, ...rest } = feeds - return rest as Record - }), - clearAll: () => set({} as Record), - set, + get value() { + return this.#value + } + + set value(value) { + this.#value = value } } @@ -108,4 +98,4 @@ export interface PostFeed { id: PostFeedID } -export let postFeeds = createPostFeedsStore() +export let postFeeds = new PostFeedState() diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 13f42450..780b9b9f 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -19,8 +19,8 @@ let { data = $bindable() } = $props() - let type = $state(data.type_) - let sort = $state(data.sort) + let type = $state(data.feed.value.type_) + let sort = $state(data.feed.value.sort) $effect(() => { if (type) settings.defaultSort.feed = type @@ -61,7 +61,11 @@ - + typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`} > diff --git a/src/routes/+page.ts b/src/routes/+page.ts index ff8f376b..5337775f 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,8 +1,13 @@ import { settings } from '$lib/settings.svelte' import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client' -import { postFeed, postFeeds, shouldReload } from '$lib/lemmy/postfeed.js' +import { + postFeed, + postFeeds, + shouldReload, +} from '$lib/lemmy/postfeed.svelte.js' import { t } from '$lib/translations.js' import { ChevronDoubleUp } from 'svelte-hero-icons' +import { ReactiveState } from '$lib/promise.svelte.js' export async function load({ url, fetch }) { const cursor = url.searchParams.get('cursor') as string | undefined @@ -14,18 +19,20 @@ export async function load({ url, fetch }) { (url.searchParams.get('type') as ListingType) || settings.defaultSort.feed return { - ...(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: [ { diff --git a/src/routes/c/[name]/+page.ts b/src/routes/c/[name]/+page.ts index ddf2c4d9..98760058 100644 --- a/src/routes/c/[name]/+page.ts +++ b/src/routes/c/[name]/+page.ts @@ -1,4 +1,4 @@ -import { postFeed } from '$lib/lemmy/postfeed.js' +import { postFeed } from '$lib/lemmy/postfeed.svelte.js' import { settings } from '$lib/settings.svelte' import type { SortType } from 'lemmy-js-client' import { get } from 'svelte/store' diff --git a/src/routes/profile/voted/[type]/+page.ts b/src/routes/profile/voted/[type]/+page.ts index e434b71b..97bb3ffc 100644 --- a/src/routes/profile/voted/[type]/+page.ts +++ b/src/routes/profile/voted/[type]/+page.ts @@ -1,5 +1,5 @@ import { client } from '$lib/lemmy.svelte.js' -import { postFeed } from '$lib/lemmy/postfeed.js' +import { postFeed } from '$lib/lemmy/postfeed.svelte.js' import { error } from '@sveltejs/kit' export async function load({ url, params, fetch }) {