Merge pull request #610 from Xyphyn/fix-feed-reactive

fix: updates to posts in a feed don't restore when returning
This commit is contained in:
Xylight authored and GitHub committed 2025-07-12 11:40:21 -07:00
commit d537ca8717
8 files changed
+72 -48

No files matched your search

+6 -5
View File
@@ -9,14 +9,15 @@
import Pageination from '$lib/components/ui/Pageination.svelte'
import { t } from '$lib/i18n/translations.js'
import { site } from '$lib/lemmy.svelte.js'
import { postFeeds } from '$lib/lemmy/postfeed.svelte.js'
import { settings } from '$lib/settings.svelte.js'
import Button from 'mono-svelte/button/Button.svelte'
import { ArrowRight, ChartBar, Icon } from 'svelte-hero-icons'
let { data = $bindable() } = $props()
let type = $state(data.feed.type_)
let sort = $state(data.feed.sort)
let type = $state(data.feed.value.type_)
let sort = $state(data.feed.value.sort)
$effect(() => {
if (type) settings.defaultSort.feed = type
@@ -62,8 +63,8 @@
</header>
<FeedComponent
bind:posts={data.feed.posts.posts}
bind:feedData={data.feed}
bind:posts={data.feed.value.posts.posts}
bind:feedData={() => data.feed.value, v => (postFeeds.value.main.data = v)}
feedId="main"
/>
<svelte:element
@@ -73,7 +74,7 @@
class="mt-auto"
>
<Pageination
cursor={{ next: data.feed.cursor.next }}
cursor={{ next: data.feed.value.cursor.next }}
href={page =>
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
back={false}
+15 -12
View File
@@ -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: [
{
@@ -116,7 +116,7 @@
<PostMeta
community={data.post.value.post_view.community}
user={data.post.value.post_view.creator}
bind:subscribed={data.post.value.community_view.subscribed}
subscribed={data.post.value.community_view.subscribed}
badges={{
deleted: data.post.value.post_view.post.deleted,
removed: data.post.value.post_view.post.removed,
@@ -162,7 +162,7 @@
{/if}
<div class="w-full relative">
<PostActions
bind:post={data.post.value.post_view}
post={data.post.value.post_view}
onedit={() =>
toast({
content: 'The post was edited successfully.',