diff options
author | dan <dan.abramov@gmail.com> | 2024-12-10 20:57:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-10 20:57:53 +0000 |
commit | d00879e628145ec6ded18048be212d09c0227ba8 (patch) | |
tree | 1a3b32f7640cc65f792b6162c12278c769cd504f /src | |
parent | e052f5e198603246cb031e00d9cadc2ae4bb140d (diff) | |
download | voidsky-d00879e628145ec6ded18048be212d09c0227ba8.tar.zst |
Disambiguate feed component naming (#7040)
* Rename posts/Feed* -> posts/PostFeed* * Rename notifications/Feed* -> notifications/NotificationFeed*
Diffstat (limited to 'src')
-rw-r--r-- | src/components/StarterPack/Main/PostsList.tsx | 4 | ||||
-rw-r--r-- | src/screens/Profile/Sections/Feed.tsx | 4 | ||||
-rw-r--r-- | src/state/feed-feedback.tsx | 2 | ||||
-rw-r--r-- | src/state/queries/post-feed.ts | 2 | ||||
-rw-r--r-- | src/view/com/feeds/FeedPage.tsx | 4 | ||||
-rw-r--r-- | src/view/com/notifications/NotificationFeed.tsx (renamed from src/view/com/notifications/Feed.tsx) | 6 | ||||
-rw-r--r-- | src/view/com/notifications/NotificationFeedItem.tsx (renamed from src/view/com/notifications/FeedItem.tsx) | 6 | ||||
-rw-r--r-- | src/view/com/posts/PostFeed.tsx (renamed from src/view/com/posts/Feed.tsx) | 14 | ||||
-rw-r--r-- | src/view/com/posts/PostFeedErrorMessage.tsx (renamed from src/view/com/posts/FeedErrorMessage.tsx) | 2 | ||||
-rw-r--r-- | src/view/com/posts/PostFeedItem.tsx (renamed from src/view/com/posts/FeedItem.tsx) | 2 | ||||
-rw-r--r-- | src/view/screens/DebugMod.tsx | 8 | ||||
-rw-r--r-- | src/view/screens/Notifications.tsx | 4 | ||||
-rw-r--r-- | src/view/screens/ProfileFeed.tsx | 4 | ||||
-rw-r--r-- | src/view/screens/ProfileList.tsx | 4 |
14 files changed, 33 insertions, 33 deletions
diff --git a/src/components/StarterPack/Main/PostsList.tsx b/src/components/StarterPack/Main/PostsList.tsx index a5275ae87..f706e0bff 100644 --- a/src/components/StarterPack/Main/PostsList.tsx +++ b/src/components/StarterPack/Main/PostsList.tsx @@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react' import {isNative} from '#/platform/detection' import {FeedDescriptor} from '#/state/queries/post-feed' -import {Feed} from '#/view/com/posts/Feed' +import {PostFeed} from '#/view/com/posts/PostFeed' import {EmptyState} from '#/view/com/util/EmptyState' import {ListRef} from '#/view/com/util/List' import {SectionRef} from '#/screens/Profile/Sections/types' @@ -38,7 +38,7 @@ export const PostsList = React.forwardRef<SectionRef, ProfilesListProps>( return ( <View> - <Feed + <PostFeed feed={feed} pollInterval={60e3} scrollElRef={scrollElRef} diff --git a/src/screens/Profile/Sections/Feed.tsx b/src/screens/Profile/Sections/Feed.tsx index 22ac5df9a..0ad197f5f 100644 --- a/src/screens/Profile/Sections/Feed.tsx +++ b/src/screens/Profile/Sections/Feed.tsx @@ -10,7 +10,7 @@ import {isNative} from '#/platform/detection' import {FeedDescriptor} from '#/state/queries/post-feed' import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed' import {truncateAndInvalidate} from '#/state/queries/util' -import {Feed} from '#/view/com/posts/Feed' +import {PostFeed} from '#/view/com/posts/PostFeed' import {EmptyState} from '#/view/com/util/EmptyState' import {ListRef} from '#/view/com/util/List' import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn' @@ -74,7 +74,7 @@ export const ProfileFeedSection = React.forwardRef< return ( <View> - <Feed + <PostFeed testID="postsFeed" enabled={isFocused} feed={feed} diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx index eaf6529f3..02f98ad14 100644 --- a/src/state/feed-feedback.tsx +++ b/src/state/feed-feedback.tsx @@ -7,7 +7,7 @@ import {PROD_DEFAULT_FEED} from '#/lib/constants' import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' import {FeedDescriptor, FeedPostSliceItem} from '#/state/queries/post-feed' -import {getFeedPostSlice} from '#/view/com/posts/Feed' +import {getFeedPostSlice} from '#/view/com/posts/PostFeed' import {useAgent} from './session' type StateContext = { diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts index 016d8893b..696e28f9c 100644 --- a/src/state/queries/post-feed.ts +++ b/src/state/queries/post-feed.ts @@ -33,7 +33,7 @@ import {STALE} from '#/state/queries' import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const' import {useAgent} from '#/state/session' import * as userActionHistory from '#/state/userActionHistory' -import {KnownError} from '#/view/com/posts/FeedErrorMessage' +import {KnownError} from '#/view/com/posts/PostFeedErrorMessage' import {useFeedTuners} from '../preferences/feed-tuners' import {useModerationOpts} from '../preferences/moderation-opts' import {usePreferencesQuery} from './preferences' diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx index 476c001d1..e766b589b 100644 --- a/src/view/com/feeds/FeedPage.tsx +++ b/src/view/com/feeds/FeedPage.tsx @@ -21,7 +21,7 @@ import {useSession} from '#/state/session' import {useSetMinimalShellMode} from '#/state/shell' import {useComposerControls} from '#/state/shell/composer' import {useHeaderOffset} from '#/components/hooks/useHeaderOffset' -import {Feed} from '../posts/Feed' +import {PostFeed} from '../posts/PostFeed' import {FAB} from '../util/fab/FAB' import {ListMethods} from '../util/List' import {LoadLatestBtn} from '../util/load-latest/LoadLatestBtn' @@ -112,7 +112,7 @@ export function FeedPage({ <View testID={testID}> <MainScrollProvider> <FeedFeedbackProvider value={feedFeedback}> - <Feed + <PostFeed testID={testID ? `${testID}-feed` : undefined} enabled={isPageFocused || shouldPrefetch} feed={feed} diff --git a/src/view/com/notifications/Feed.tsx b/src/view/com/notifications/NotificationFeed.tsx index 9871455a1..5168933ae 100644 --- a/src/view/com/notifications/Feed.tsx +++ b/src/view/com/notifications/NotificationFeed.tsx @@ -21,13 +21,13 @@ import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' import {List, ListRef} from '#/view/com/util/List' import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn' -import {FeedItem} from './FeedItem' +import {NotificationFeedItem} from './NotificationFeedItem' const EMPTY_FEED_ITEM = {_reactKey: '__empty__'} const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'} const LOADING_ITEM = {_reactKey: '__loading__'} -export function Feed({ +export function NotificationFeed({ scrollElRef, onPressTryAgain, onScrolledDownChange, @@ -136,7 +136,7 @@ export function Feed({ ) } return ( - <FeedItem + <NotificationFeedItem item={item} moderationOpts={moderationOpts!} hideTopBorder={index === 0} diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx index b90f2ecd6..4902e66bc 100644 --- a/src/view/com/notifications/FeedItem.tsx +++ b/src/view/com/notifications/NotificationFeedItem.tsx @@ -76,7 +76,7 @@ interface Author { moderation: ModerationDecision } -let FeedItem = ({ +let NotificationFeedItem = ({ item, moderationOpts, hideTopBorder, @@ -494,8 +494,8 @@ let FeedItem = ({ </Link> ) } -FeedItem = memo(FeedItem) -export {FeedItem} +NotificationFeedItem = memo(NotificationFeedItem) +export {NotificationFeedItem} function ExpandListPressable({ hasMultipleAuthors, diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/PostFeed.tsx index fb5484919..d81137113 100644 --- a/src/view/com/posts/Feed.tsx +++ b/src/view/com/posts/PostFeed.tsx @@ -37,9 +37,9 @@ import {List, ListRef} from '../util/List' import {PostFeedLoadingPlaceholder} from '../util/LoadingPlaceholder' import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn' import {DiscoverFallbackHeader} from './DiscoverFallbackHeader' -import {FeedErrorMessage} from './FeedErrorMessage' -import {FeedItem} from './FeedItem' import {FeedShutdownMsg} from './FeedShutdownMsg' +import {PostFeedErrorMessage} from './PostFeedErrorMessage' +import {PostFeedItem} from './PostFeedItem' import {ViewFullThread} from './ViewFullThread' type FeedRow = @@ -101,7 +101,7 @@ export function getFeedPostSlice(feedRow: FeedRow): FeedPostSlice | null { // const REFRESH_AFTER = STALE.HOURS.ONE const CHECK_LATEST_AFTER = STALE.SECONDS.THIRTY -let Feed = ({ +let PostFeed = ({ feed, feedParams, ignoreFilterFor, @@ -444,7 +444,7 @@ let Feed = ({ return renderEmptyState() } else if (row.type === 'error') { return ( - <FeedErrorMessage + <PostFeedErrorMessage feedDesc={feed} error={error ?? undefined} onPressTryAgain={onPressTryAgain} @@ -480,7 +480,7 @@ let Feed = ({ const indexInSlice = row.indexInSlice const item = slice.items[indexInSlice] return ( - <FeedItem + <PostFeedItem post={item.post} record={item.record} reason={indexInSlice === 0 ? slice.reason : undefined} @@ -576,8 +576,8 @@ let Feed = ({ </View> ) } -Feed = memo(Feed) -export {Feed} +PostFeed = memo(PostFeed) +export {PostFeed} const styles = StyleSheet.create({ feedFooter: {paddingTop: 20}, diff --git a/src/view/com/posts/FeedErrorMessage.tsx b/src/view/com/posts/PostFeedErrorMessage.tsx index a58216233..39347b89c 100644 --- a/src/view/com/posts/FeedErrorMessage.tsx +++ b/src/view/com/posts/PostFeedErrorMessage.tsx @@ -30,7 +30,7 @@ export enum KnownError { Unknown = 'Unknown', } -export function FeedErrorMessage({ +export function PostFeedErrorMessage({ feedDesc, error, onPressTryAgain, diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx index c04921c68..4b18c470a 100644 --- a/src/view/com/posts/FeedItem.tsx +++ b/src/view/com/posts/PostFeedItem.tsx @@ -70,7 +70,7 @@ interface FeedItemProps { isParentNotFound?: boolean } -export function FeedItem({ +export function PostFeedItem({ post, record, reason, diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx index b87fc8683..74a58a56a 100644 --- a/src/view/screens/DebugMod.tsx +++ b/src/view/screens/DebugMod.tsx @@ -44,9 +44,9 @@ import { import * as Layout from '#/components/Layout' import {H1, H3, P, Text} from '#/components/Typography' import {ScreenHider} from '../../components/moderation/ScreenHider' -import {FeedItem as NotifFeedItem} from '../com/notifications/FeedItem' +import {NotificationFeedItem} from '../com/notifications/NotificationFeedItem' import {PostThreadItem} from '../com/post-thread/PostThreadItem' -import {FeedItem} from '../com/posts/FeedItem' +import {PostFeedItem} from '../com/posts/PostFeedItem' import {ProfileCard} from '../com/profile/ProfileCard' const LABEL_VALUES: (keyof typeof LABELS)[] = Object.keys( @@ -817,7 +817,7 @@ function MockPostFeedItem({ ) } return ( - <FeedItem + <PostFeedItem post={post} record={post.record as AppBskyFeedPost.Record} moderation={moderation} @@ -872,7 +872,7 @@ function MockNotifItem({ </P> ) } - return <NotifFeedItem item={notif} moderationOpts={moderationOpts} /> + return <NotificationFeedItem item={notif} moderationOpts={moderationOpts} /> } function MockAccountCard({ diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx index 35591f270..70ab32db0 100644 --- a/src/view/screens/Notifications.tsx +++ b/src/view/screens/Notifications.tsx @@ -23,7 +23,7 @@ import { import {truncateAndInvalidate} from '#/state/queries/util' import {useSetMinimalShellMode} from '#/state/shell' import {useComposerControls} from '#/state/shell/composer' -import {Feed} from '#/view/com/notifications/Feed' +import {NotificationFeed} from '#/view/com/notifications/NotificationFeed' import {FAB} from '#/view/com/util/fab/FAB' import {ListMethods} from '#/view/com/util/List' import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn' @@ -156,7 +156,7 @@ export function NotificationsScreen({route: {params}}: Props) { </Layout.Header.Outer> <MainScrollProvider> - <Feed + <NotificationFeed onScrolledDownChange={setIsScrolledDown} scrollElRef={scrollElRef} overridePriorityNotifications={params?.show === 'all'} diff --git a/src/view/screens/ProfileFeed.tsx b/src/view/screens/ProfileFeed.tsx index 63469ef4f..dd2f8f12b 100644 --- a/src/view/screens/ProfileFeed.tsx +++ b/src/view/screens/ProfileFeed.tsx @@ -39,7 +39,7 @@ import {truncateAndInvalidate} from '#/state/queries/util' import {useSession} from '#/state/session' import {useComposerControls} from '#/state/shell/composer' import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader' -import {Feed} from '#/view/com/posts/Feed' +import {PostFeed} from '#/view/com/posts/PostFeed' import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader' import {EmptyState} from '#/view/com/util/EmptyState' import {FAB} from '#/view/com/util/fab/FAB' @@ -480,7 +480,7 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>( return ( <View> <FeedFeedbackProvider value={feedFeedback}> - <Feed + <PostFeed enabled={isFocused} feed={feed} pollInterval={60e3} diff --git a/src/view/screens/ProfileList.tsx b/src/view/screens/ProfileList.tsx index a927526ad..27ede80a3 100644 --- a/src/view/screens/ProfileList.tsx +++ b/src/view/screens/ProfileList.tsx @@ -54,7 +54,7 @@ import {useSetMinimalShellMode} from '#/state/shell' import {useComposerControls} from '#/state/shell/composer' import {ListMembers} from '#/view/com/lists/ListMembers' import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader' -import {Feed} from '#/view/com/posts/Feed' +import {PostFeed} from '#/view/com/posts/PostFeed' import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader' import {EmptyState} from '#/view/com/util/EmptyState' import {FAB} from '#/view/com/util/fab/FAB' @@ -789,7 +789,7 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>( return ( <View> - <Feed + <PostFeed testID="listFeed" enabled={isFocused} feed={feed} |