diff --git a/src/lib/components/lemmy/post/feed/PostFeed.svelte b/src/lib/components/lemmy/post/feed/PostFeed.svelte
index 5eac3f6c..08f2bb7f 100644
--- a/src/lib/components/lemmy/post/feed/PostFeed.svelte
+++ b/src/lib/components/lemmy/post/feed/PostFeed.svelte
@@ -5,9 +5,6 @@
import type { PostView } from 'lemmy-js-client'
import { Badge, Button } from 'mono-svelte'
import { ArchiveBox, Icon, Minus, Plus } from 'svelte-hero-icons'
- import { expoOut } from 'svelte/easing'
- import { fly, slide } from 'svelte/transition'
- import { combineCrossposts } from './crosspost.svelte'
interface Props {
posts: PostView[]
@@ -24,11 +21,6 @@
children,
...rest
}: Props = $props()
- let etc = rest
-
- let combinedPosts = $derived(combineCrossposts(posts))
-
- let viewPost: number = $state(-1)
{:else}
- {#each combinedPosts as post, index}
- {#if !(settings.hidePosts.deleted && post.post.deleted) && !(settings.hidePosts.removed && post.post.removed)}
- -
- {
- posts = posts.toSpliced(index, 1)
- }}
- >
- {#snippet extraBadges()}
- {#if post.withCrossposts}
- {/if}
- {/snippet}
-
- {#if post.withCrossposts && viewPost == post.post.id}
-
-
- Crossposts
- {post.crossposts.length}
-
- {#each post.crossposts as crosspost, index}
-
- {/each}
-
- {/if}
-
- {/if}
+ {#each posts as post, index (post.post.id)}
+ -
+ {
+ posts = posts.toSpliced(index, 1)
+ }}
+ />
+
{/each}
{/if}
{@render children?.()}
diff --git a/src/lib/components/ui/Pageination.svelte b/src/lib/components/ui/Pageination.svelte
index 01ae6525..dd788638 100644
--- a/src/lib/components/ui/Pageination.svelte
+++ b/src/lib/components/ui/Pageination.svelte
@@ -15,6 +15,7 @@
onchange?: (page: number) => void
onchangecursor?: (cursor: string) => void
href?: (current: number | string) => string
+ back?: boolean
}
let {
@@ -25,6 +26,7 @@
onchange,
onchangecursor,
href,
+ back = true,
}: Props = $props()
let customHref = (href?: string) => {
@@ -53,21 +55,24 @@
{/if}
-
+ {#if back}
+
+ {/if}
{#if page}
diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte
index 4d7315db..0392b692 100644
--- a/src/lib/mono/button/Button.svelte
+++ b/src/lib/mono/button/Button.svelte
@@ -152,6 +152,7 @@
scale: false,
large: false,
},
+ disabled,
loaderWidth = undefined,
href = undefined,
class: clazz = '',
@@ -167,12 +168,14 @@
role={href ? 'link' : 'button'}
{href}
{...rest}
+ tabindex={disabled ? -1 : undefined}
class={[
loading ? buttonColor.secondary : buttonColor[color],
buttonSize[size],
buttonRounding[rounding][roundingSide],
buttonShadow[shadow],
'text-sm transition-all font-medium cursor-pointer duration-75 disabled:opacity-50 disabled:pointer-events-none',
+ disabled && 'pointer-events-none opacity-50',
alignment == 'center'
? 'origin-center'
: alignment == 'left'
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 780b9b9f..13bb1c0c 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -76,6 +76,7 @@
cursor={{ next: data.feed.value.cursor.next }}
href={(page) =>
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
+ back={false}
>
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index 5337775f..20335351 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -11,7 +11,7 @@ import { ReactiveState } from '$lib/promise.svelte.js'
export async function load({ url, fetch }) {
const cursor = url.searchParams.get('cursor') as string | undefined
- const prevCursor = url.searchParams.get('prevCursor') as string | undefined
+ const prevCursor = url.searchParams.get('cursorPrev') as string | undefined
const sort: SortType =
(url.searchParams.get('sort') as SortType) || settings.defaultSort.sort