From ef74a4e6d28375174341992b4f1a7b5bc978ce12 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 4 Jul 2024 13:40:33 -0700 Subject: [PATCH] feat: add setting for infinite scroll --- src/lib/i18n/en.json | 4 ++++ src/lib/settings.ts | 2 ++ src/routes/+page.svelte | 36 ++++++++++++++++++-------------- src/routes/+page.ts | 3 +++ src/routes/settings/+page.svelte | 5 +++++ 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 234d04b1..b55800e3 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -594,6 +594,10 @@ "title": "Default sort", "description": "The default sorting to use in feeds." }, + "infiniteScroll": { + "title": "Infinite scroll", + "description": "New posts are added as you scroll down, without having to click 'next'." + }, "postsInNewTab": { "title": "Open posts in new tab", "description": "Open posts in a separate tab instead of the current." diff --git a/src/lib/settings.ts b/src/lib/settings.ts index dfeb2611..3c21ea98 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -88,6 +88,7 @@ interface Settings { compactFeatured: boolean showHidden: boolean } + infiniteScroll: boolean language: string | null translator: string | undefined } @@ -155,6 +156,7 @@ export const defaultSettings: Settings = { compactFeatured: toBool(env.PUBLIC_COMPACT_FEATURED) ?? true, showHidden: false, }, + infiniteScroll: true, language: env.PUBLIC_LANGUAGE ?? null, translator: env.PUBLIC_TRANSLATOR ?? undefined, } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 76ae6b89..7f34e614 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -21,11 +21,12 @@ import { Spinner } from 'mono-svelte' import { writable } from 'svelte/store' import type { GetPostsResponse } from 'lemmy-js-client' + import { userSettings } from '$lib/settings.js' export let data const limit = 20 - let hasMore = data.posts.posts.length == limit + let hasMore = data.posts.posts.length != 0 async function loadMore() { if (!hasMore) return @@ -38,14 +39,12 @@ page_cursor: data.cursor.next, }) - hasMore = newPosts.posts.length == limit - - console.log(hasMore) + hasMore = newPosts.posts.length != 0 data.cursor.next = newPosts.next_page data.posts.posts = [...data.posts.posts, ...newPosts.posts] - _posts.set({ data: data.posts, params: $page.url.searchParams }) + _posts.update((ps) => ({ data: data.posts, params: ps.params })) } @@ -62,19 +61,24 @@ - {#if hasMore} -
-
-
-
-
-
+ {#if $userSettings.infiniteScroll} + {#if hasMore} +
+
+
+
+
+
+
-
+ {/if} + {/if} - -
+ -
+