(null);
@@ -199,7 +202,7 @@ const Home = () => {
const footerProps = useMemo(
() => ({
- feedLength: feed?.length,
+ feedLength: feed?.length ?? 0,
hasFeedLoaded: !!feed,
hasMore,
communityAddresses,
@@ -213,6 +216,7 @@ const Home = () => {
isSearching,
showNoResults,
onClearSearch,
+ onLoadMore: combinedLoadMore,
}),
[
feed,
@@ -228,6 +232,7 @@ const Home = () => {
isSearching,
showNoResults,
onClearSearch,
+ combinedLoadMore,
],
);
@@ -301,7 +306,7 @@ const Home = () => {
components={{
Footer: () => ,
}}
- endReached={combinedLoadMore}
+ endReached={infiniteFeedEnabled ? combinedLoadMore : undefined}
ref={virtuosoRef}
restoreStateFrom={lastVirtuosoState}
initialScrollTop={lastVirtuosoState?.scrollTop}
diff --git a/src/views/mod/mod.tsx b/src/views/mod/mod.tsx
index 964bf013..02366e28 100644
--- a/src/views/mod/mod.tsx
+++ b/src/views/mod/mod.tsx
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
import { commentMatchesPattern } from '../../lib/utils/pattern-utils';
import useFeedFiltersStore from '../../stores/use-feed-filters-store';
import useTimeFilter, { isValidTimeFilterName } from '../../hooks/use-time-filter';
+import { FEED_POSTS_PER_PAGE, useInfiniteFeedEnabled } from '../../hooks/use-feed-pagination';
import FeedFooter from '../../components/feed-footer';
import { getCommunityIdentifiers } from '../../hooks/use-community-identifier';
import LoadingEllipsis from '../../components/loading-ellipsis';
@@ -38,6 +39,7 @@ const Mod = () => {
}, [params?.sortType, params.timeFilterName, navigate]);
const { isSearching } = useFeedFiltersStore();
+ const infiniteFeedEnabled = useInfiniteFeedEnabled();
const [showNoResults, setShowNoResults] = useState(false);
const [searchAttemptCompleted, setSearchAttemptCompleted] = useState(false);
const { t } = useTranslation();
@@ -45,6 +47,7 @@ const Mod = () => {
const feedOptions = useMemo(() => {
const options: any = {
newerThan: searchQuery ? 0 : timeFilterSeconds,
+ postsPerPage: FEED_POSTS_PER_PAGE,
sortType,
communities: getCommunityIdentifiers(communityAddresses),
};
@@ -94,13 +97,14 @@ const Mod = () => {
});
// Combined loadMore function for better performance when sort type isn't 'top'
- const combinedLoadMore = () => {
- loadMore();
+ const combinedLoadMore = async () => {
+ const loadMorePromises = [loadMore()];
if (sortType !== 'top') {
- if (hasMoreWeekly) loadMoreWeekly();
- if (hasMoreMonthly) loadMoreMonthly();
- if (hasMoreYearly) loadMoreYearly();
+ if (hasMoreWeekly) loadMorePromises.push(loadMoreWeekly());
+ if (hasMoreMonthly) loadMorePromises.push(loadMoreMonthly());
+ if (hasMoreYearly) loadMorePromises.push(loadMoreYearly());
}
+ await Promise.all(loadMorePromises);
};
// Reset no results state when search query changes
@@ -151,7 +155,7 @@ const Mod = () => {
const lastVirtuosoState = lastVirtuosoStates?.[sortType + currentTimeFilterName + 'mod' + searchQuery];
const footerProps = {
- feedLength: feed?.length,
+ feedLength: feed?.length ?? 0,
hasFeedLoaded: !!feed,
hasMore,
communityAddresses,
@@ -164,6 +168,7 @@ const Mod = () => {
searchQuery: searchQuery,
isSearching,
showNoResults,
+ onLoadMore: combinedLoadMore,
};
const handleClearSearch = () => {
@@ -228,7 +233,7 @@ const Mod = () => {
itemContent={(index, post) => }
useWindowScroll={true}
components={{ Footer: () => }}
- endReached={combinedLoadMore}
+ endReached={infiniteFeedEnabled ? combinedLoadMore : undefined}
ref={virtuosoRef}
restoreStateFrom={lastVirtuosoState}
initialScrollTop={lastVirtuosoState?.scrollTop}
diff --git a/src/views/settings/content-options/content-options.tsx b/src/views/settings/content-options/content-options.tsx
index 687c1eaf..62d1969c 100644
--- a/src/views/settings/content-options/content-options.tsx
+++ b/src/views/settings/content-options/content-options.tsx
@@ -4,6 +4,7 @@ import styles from './content-options.module.css';
import useContentOptionsStore from '../../../stores/use-content-options-store';
import { useDefaultSubscriptions } from '../../../hooks/use-default-subscriptions';
import { handleNSFWSubscriptionPrompt } from '../../../lib/utils/nsfw-subscription-utils';
+import { useInfiniteFeedEnabled } from '../../../hooks/use-feed-pagination';
const MediaOptions = () => {
const { t } = useTranslation();
@@ -163,6 +164,21 @@ const CommunitiesOptions = () => {
);
};
+const FeedOptions = () => {
+ const { t } = useTranslation();
+ const infiniteFeedEnabled = useInfiniteFeedEnabled();
+ const setInfiniteFeedEnabled = useContentOptionsStore((state) => state.setInfiniteFeedEnabled);
+
+ return (
+
+
+
+ );
+};
+
const ContentOptions = () => {
const { t } = useTranslation();
@@ -180,6 +196,12 @@ const ContentOptions = () => {
+
+ {t('feeds')}
+
+
+
+
);
};