cleanup: switch to state-based post feeds
This commit is contained in:
10 files changed
+79
-85
No files matched your search
@@ -56,11 +56,6 @@
|
|||||||
open = $bindable(true),
|
open = $bindable(true),
|
||||||
}: Props = $props()
|
}: 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 editing = $state(false)
|
||||||
let newComment = $state(node.comment_view.comment.content)
|
let newComment = $state(node.comment_view.comment.content)
|
||||||
let editingLoad = $state(false)
|
let editingLoad = $state(false)
|
||||||
|
|||||||
@@ -121,6 +121,7 @@
|
|||||||
node.comment_view.counts.child_count > 0
|
node.comment_view.counts.child_count > 0
|
||||||
? 'border-l'
|
? 'border-l'
|
||||||
: ''} ml-2.5 border-slate-200 dark:border-zinc-800 pl-2.5 "
|
: ''} 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}
|
{#if node.children?.length > 0}
|
||||||
<Comments {post} nodes={nodes[index].children} isParent={false} />
|
<Comments {post} nodes={nodes[index].children} isParent={false} />
|
||||||
|
|||||||
@@ -119,7 +119,7 @@
|
|||||||
{style}
|
{style}
|
||||||
>
|
>
|
||||||
<PostVote
|
<PostVote
|
||||||
post={post.post}
|
bind:post={post.post}
|
||||||
vote={post.my_vote}
|
vote={post.my_vote}
|
||||||
score={post.counts.score}
|
score={post.counts.score}
|
||||||
upvotes={post.counts.upvotes}
|
upvotes={post.counts.upvotes}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
let {
|
let {
|
||||||
post,
|
post = $bindable(),
|
||||||
vote = $bindable(0),
|
vote = $bindable(0),
|
||||||
score = $bindable(),
|
score = $bindable(),
|
||||||
upvotes = $bindable(0),
|
upvotes = $bindable(0),
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
postFeeds,
|
postFeeds,
|
||||||
type PostFeed,
|
type PostFeed,
|
||||||
type PostFeedID,
|
type PostFeedID,
|
||||||
} from '$lib/lemmy/postfeed'
|
} from '$lib/lemmy/postfeed.svelte'
|
||||||
import { settings } from '$lib/settings.svelte.js'
|
import { settings } from '$lib/settings.svelte.js'
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import { createWindowVirtualizer } from '@tanstack/svelte-virtual'
|
import { createWindowVirtualizer } from '@tanstack/svelte-virtual'
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
let virtualListEl: HTMLElement | undefined = $state(undefined)
|
let virtualListEl: HTMLElement | undefined = $state(undefined)
|
||||||
|
|
||||||
afterNavigate(() => {
|
afterNavigate(() => {
|
||||||
$virtualizer.scrollToIndex($postFeeds[feedId]?.lastSeen ?? 0)
|
$virtualizer.scrollToIndex(postFeeds.value[feedId]?.lastSeen ?? 0)
|
||||||
})
|
})
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -94,9 +94,7 @@
|
|||||||
feedData.cursor.next = newPosts.next_page
|
feedData.cursor.next = newPosts.next_page
|
||||||
feedData.posts.posts = [...feedData.posts.posts, ...newPosts.posts]
|
feedData.posts.posts = [...feedData.posts.posts, ...newPosts.posts]
|
||||||
|
|
||||||
postFeeds.updateFeed(feedId, {
|
postFeeds.value[feedId].data = feedData
|
||||||
data: feedData,
|
|
||||||
})
|
|
||||||
|
|
||||||
loading = false
|
loading = false
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -114,9 +112,8 @@
|
|||||||
|
|
||||||
if (!id) return
|
if (!id) return
|
||||||
|
|
||||||
postFeeds.updateFeed(feedId, {
|
postFeeds.value[feedId].lastSeen = Number(id)
|
||||||
lastSeen: Number(id),
|
|
||||||
})
|
|
||||||
observer.unobserve(element)
|
observer.unobserve(element)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -164,10 +161,12 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
let items = $derived($virtualizer.getVirtualItems())
|
let items = $derived($virtualizer.getVirtualItems())
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (virtualItemEls.length)
|
if (virtualItemEls.length)
|
||||||
virtualItemEls.forEach($virtualizer.measureElement)
|
virtualItemEls.forEach($virtualizer.measureElement)
|
||||||
})
|
})
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (posts.length && virtualListEl)
|
if (posts.length && virtualListEl)
|
||||||
$virtualizer.setOptions({
|
$virtualizer.setOptions({
|
||||||
@@ -209,30 +208,28 @@
|
|||||||
id="feed"
|
id="feed"
|
||||||
>
|
>
|
||||||
{#each items as row, index (posts[row.index]?.post.id)}
|
{#each items as row, index (posts[row.index]?.post.id)}
|
||||||
{#if posts[row.index]}
|
<li
|
||||||
<li
|
bind:this={virtualItemEls[index]}
|
||||||
bind:this={virtualItemEls[index]}
|
data-index={row.index}
|
||||||
data-index={row.index}
|
style={row.index < 7 ? `--anim-delay: ${index * 100}ms` : ''}
|
||||||
style={row.index < 7 ? `--anim-delay: ${index * 100}ms` : ''}
|
class="relative post-container {row.index < 7
|
||||||
class="relative post-container {row.index < 7
|
? 'pop-in opacity-0'
|
||||||
? 'pop-in opacity-0'
|
: ''} -mx-4 sm:-mx-6 px-4 sm:px-6"
|
||||||
: ''} -mx-4 sm:-mx-6 px-4 sm:px-6"
|
>
|
||||||
>
|
<Post
|
||||||
<Post
|
bind:post={posts[row.index]}
|
||||||
bind:post={posts[row.index]}
|
hideCommunity={community}
|
||||||
hideCommunity={community}
|
view={(posts[row.index]?.post.featured_community ||
|
||||||
view={(posts[row.index]?.post.featured_community ||
|
posts[row.index]?.post.featured_local) &&
|
||||||
posts[row.index]?.post.featured_local) &&
|
settings.posts.compactFeatured
|
||||||
settings.posts.compactFeatured
|
? 'compact'
|
||||||
? 'compact'
|
: settings.view}
|
||||||
: settings.view}
|
class="transition-all duration-250"
|
||||||
class="transition-all duration-250"
|
onhide={() => {
|
||||||
onhide={() => {
|
posts = posts.toSpliced(row.index, 1)
|
||||||
posts = posts.toSpliced(row.index, 1)
|
}}
|
||||||
}}
|
></Post>
|
||||||
></Post>
|
</li>
|
||||||
</li>
|
|
||||||
{/if}
|
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import type {
|
|||||||
ListingType,
|
ListingType,
|
||||||
SortType,
|
SortType,
|
||||||
} from 'lemmy-js-client'
|
} from 'lemmy-js-client'
|
||||||
import { get, writable } from 'svelte/store'
|
|
||||||
|
|
||||||
export const shouldReload = (
|
export const shouldReload = (
|
||||||
cache: PostFeed | undefined,
|
cache: PostFeed | undefined,
|
||||||
@@ -30,14 +29,15 @@ export async function postFeed(args: {
|
|||||||
init?: RequestInit | undefined,
|
init?: RequestInit | undefined,
|
||||||
) => Promise<Response>
|
) => Promise<Response>
|
||||||
}) {
|
}) {
|
||||||
const feed = get(postFeeds)[args.id]
|
const feed = postFeeds.value[args.id]
|
||||||
|
|
||||||
const posts = shouldReload(feed, args.url, instance.data)
|
const posts = shouldReload(feed, args.url, instance.data)
|
||||||
? await client({ func: args.fetch }).getPosts(args.request)
|
? await client({ func: args.fetch }).getPosts(args.request)
|
||||||
: feed.data.posts
|
: feed.data.posts
|
||||||
|
|
||||||
if (shouldReload(feed, args.url, instance.data) && browser)
|
if (shouldReload(feed, args.url, instance.data) && browser)
|
||||||
postFeeds.updateFeed(args.id, {
|
postFeeds.value[args.id] = {
|
||||||
|
id: args.id,
|
||||||
data: {
|
data: {
|
||||||
...args.request,
|
...args.request,
|
||||||
posts: posts,
|
posts: posts,
|
||||||
@@ -49,10 +49,10 @@ export async function postFeed(args: {
|
|||||||
url: args.url,
|
url: args.url,
|
||||||
lastSeen: 0,
|
lastSeen: 0,
|
||||||
instance: instance.data,
|
instance: instance.data,
|
||||||
})
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
get(postFeeds)[args.id]?.data ?? {
|
postFeeds.value[args.id]?.data ?? {
|
||||||
...args.request,
|
...args.request,
|
||||||
posts: posts,
|
posts: posts,
|
||||||
cursor: {
|
cursor: {
|
||||||
@@ -67,28 +67,18 @@ export function getPostFeed(feeds: Map<PostFeedID, PostFeed>, id: PostFeedID) {
|
|||||||
return feeds.get(id)
|
return feeds.get(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
function createPostFeedsStore() {
|
class PostFeedState {
|
||||||
// @ts-ignore
|
#value: Record<PostFeedID, PostFeed> = $state({}) as Record<
|
||||||
const { subscribe, update, set } = writable<Record<PostFeedID, PostFeed>>({})
|
PostFeedID,
|
||||||
|
PostFeed
|
||||||
|
>
|
||||||
|
|
||||||
return {
|
get value() {
|
||||||
subscribe,
|
return this.#value
|
||||||
addFeed: (id: PostFeedID, feed: PostFeed) =>
|
}
|
||||||
update((feeds) => ({ ...feeds, [id]: feed })),
|
|
||||||
updateFeed: (id: PostFeedID, feed: Partial<PostFeed>) =>
|
set value(value) {
|
||||||
update((feeds) => {
|
this.#value = value
|
||||||
return {
|
|
||||||
...feeds,
|
|
||||||
[id]: { ...feeds[id], ...feed } as PostFeed,
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
removeFeed: (id: PostFeedID) =>
|
|
||||||
update((feeds) => {
|
|
||||||
const { [id]: _, ...rest } = feeds
|
|
||||||
return rest as Record<PostFeedID, PostFeed>
|
|
||||||
}),
|
|
||||||
clearAll: () => set({} as Record<PostFeedID, PostFeed>),
|
|
||||||
set,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,4 +98,4 @@ export interface PostFeed {
|
|||||||
id: PostFeedID
|
id: PostFeedID
|
||||||
}
|
}
|
||||||
|
|
||||||
export let postFeeds = createPostFeedsStore()
|
export let postFeeds = new PostFeedState()
|
||||||
@@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
let { data = $bindable() } = $props()
|
let { data = $bindable() } = $props()
|
||||||
|
|
||||||
let type = $state(data.type_)
|
let type = $state(data.feed.value.type_)
|
||||||
let sort = $state(data.sort)
|
let sort = $state(data.feed.value.sort)
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (type) settings.defaultSort.feed = type
|
if (type) settings.defaultSort.feed = type
|
||||||
@@ -61,7 +61,11 @@
|
|||||||
</Header>
|
</Header>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<FeedComponent bind:posts={data.posts.posts} feedData={data} feedId="main" />
|
<FeedComponent
|
||||||
|
bind:posts={data.feed.value.posts.posts}
|
||||||
|
bind:feedData={data.feed.value}
|
||||||
|
feedId="main"
|
||||||
|
/>
|
||||||
<svelte:element
|
<svelte:element
|
||||||
this={settings.infiniteScroll && !settings.posts.noVirtualize
|
this={settings.infiniteScroll && !settings.posts.noVirtualize
|
||||||
? 'noscript'
|
? 'noscript'
|
||||||
@@ -69,7 +73,7 @@
|
|||||||
class="mt-auto"
|
class="mt-auto"
|
||||||
>
|
>
|
||||||
<Pageination
|
<Pageination
|
||||||
cursor={{ next: data.cursor.next }}
|
cursor={{ next: data.feed.value.cursor.next }}
|
||||||
href={(page) =>
|
href={(page) =>
|
||||||
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
|
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
|
||||||
>
|
>
|
||||||
|
|||||||
+20
-13
@@ -1,8 +1,13 @@
|
|||||||
import { settings } from '$lib/settings.svelte'
|
import { settings } from '$lib/settings.svelte'
|
||||||
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
|
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 { t } from '$lib/translations.js'
|
||||||
import { ChevronDoubleUp } from 'svelte-hero-icons'
|
import { ChevronDoubleUp } from 'svelte-hero-icons'
|
||||||
|
import { ReactiveState } from '$lib/promise.svelte.js'
|
||||||
|
|
||||||
export async function load({ url, fetch }) {
|
export async function load({ url, fetch }) {
|
||||||
const cursor = url.searchParams.get('cursor') as string | undefined
|
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
|
(url.searchParams.get('type') as ListingType) || settings.defaultSort.feed
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...(await postFeed({
|
feed: new ReactiveState(
|
||||||
id: 'main',
|
await postFeed({
|
||||||
request: {
|
id: 'main',
|
||||||
page_cursor: cursor,
|
request: {
|
||||||
sort: sort,
|
page_cursor: cursor,
|
||||||
type_: listingType,
|
sort: sort,
|
||||||
limit: 20,
|
type_: listingType,
|
||||||
show_hidden: settings.posts.showHidden,
|
limit: 20,
|
||||||
},
|
show_hidden: settings.posts.showHidden,
|
||||||
url: url,
|
},
|
||||||
fetch: fetch,
|
url: url,
|
||||||
})),
|
fetch: fetch,
|
||||||
|
}),
|
||||||
|
),
|
||||||
contextual: {
|
contextual: {
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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 { settings } from '$lib/settings.svelte'
|
||||||
import type { SortType } from 'lemmy-js-client'
|
import type { SortType } from 'lemmy-js-client'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { client } from '$lib/lemmy.svelte.js'
|
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'
|
import { error } from '@sveltejs/kit'
|
||||||
|
|
||||||
export async function load({ url, params, fetch }) {
|
export async function load({ url, params, fetch }) {
|
||||||
|
|||||||
Reference in new issue
Block a user