From 25b8f34b6171543102c31f5d8f90410cca0fc614 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 6 Jul 2025 15:41:17 -0700 Subject: [PATCH] misc: update virtual list overscan logic --- src/lib/components/lemmy/SiteCard.svelte | 1 - .../lemmy/comment/CommentListVirtualizer.svelte | 4 ++-- src/lib/components/lemmy/post/feed/VirtualFeed.svelte | 3 ++- src/lib/components/render/VirtualList.svelte | 10 ++++++++-- .../[instance]/[id=integer]/CommentProvider.svelte | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 823ae4a6..fc3cdd73 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -9,7 +9,6 @@ import { Badge } from 'mono-svelte' import { Icon, ServerStack } from 'svelte-hero-icons' import Link from '../input/Link.svelte' - import Entity from '../ui/Entity.svelte' import Expandable from '../ui/Expandable.svelte' import LabelStat from '../ui/LabelStat.svelte' import ItemList from './generic/ItemList.svelte' diff --git a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte index 7917712b..78c4e5fc 100644 --- a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte +++ b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte @@ -42,8 +42,8 @@ {#if offsetEl} diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 334e8b6c..0727d740 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -174,7 +174,8 @@ class="divide-y -mx-4 sm:-mx-6 divide-slate-200 dark:divide-zinc-900" items={posts} {initialOffset} - overscan={1000} + overscan={3} + estimatedHeight={settings.view == 'cozy' ? 500 : 150} bind:restore={postFeeds.value[feedId].clientData} bind:this={listComp} > diff --git a/src/lib/components/render/VirtualList.svelte b/src/lib/components/render/VirtualList.svelte index cf36207a..5b1bf997 100644 --- a/src/lib/components/render/VirtualList.svelte +++ b/src/lib/components/render/VirtualList.svelte @@ -112,13 +112,19 @@ const firstIndex = findFirstVisibleIndex(scrollTop, cumulativeItemHeights) - let i = firstIndex + const startIndex = Math.max(0, firstIndex - overscan) + + let i = startIndex let offset = i == 0 ? 0 : cumulativeItemHeights[i - 1] - while (i < items.length && offset < scrollTop + viewportHeight + overscan) { + while (i < items.length) { newVisibleItems.push({ index: i, offset: offset }) const height = itemHeights[i] || estimatedHeight offset += height + + if (offset > scrollTop + viewportHeight + overscan * estimatedHeight) + break + i++ } diff --git a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte index 4ac6da08..dfb8c03a 100644 --- a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte +++ b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte @@ -102,7 +102,7 @@ { - comments.comments = [comment.comment_view, ...comments.comments] + comments.comments.push(comment.comment_view) }} onfocus={() => (commenting = true)} tools={commenting}