Merge remote-tracking branch 'origin/main' into follow-guide-api

src/screens/Search/Explore.tsx

@@ -51,7 +51,7 @@ import {ExploreInterestsCard} from '#/screens/Search/modules/ExploreInterestsCar
 import {ExploreRecommendations} from '#/screens/Search/modules/ExploreRecommendations'
 import {ExploreTrendingTopics} from '#/screens/Search/modules/ExploreTrendingTopics'
 import {ExploreTrendingVideos} from '#/screens/Search/modules/ExploreTrendingVideos'
-import {atoms as a, native, platform, useTheme, web} from '#/alf'
+import {atoms as a, native, platform, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button} from '#/components/Button'
 import * as FeedCard from '#/components/FeedCard'
@@ -202,7 +202,6 @@ type ExploreScreenItems =
 
 export function Explore({
   focusSearchInput,
-  headerHeight,
 }: {
   focusSearchInput: (tab: 'user' | 'profile' | 'feed') => void
   headerHeight: number
@@ -215,7 +214,6 @@ export function Explore({
   const gate = useGate()
   const guide = useProgressGuide('follow-10')
   const [selectedInterest, setSelectedInterest] = useState<string | null>(null)
-  // TODO always get at least 10 back TODO still
   const {
     data: suggestedUsers,
     isLoading: suggestedUsersIsLoading,
@@ -372,9 +370,14 @@ export function Explore({
               type: 'profileEmpty',
               key: 'profileEmpty',
             })
+          } else {
+            if (selectedInterest === null) {
+              // First "For You" tab, only show 5 to keep screen short
+              i.push(...profileItems.slice(0, 5))
             } else {
               i.push(...profileItems)
             }
+          }
         } else {
           i.push({
             type: 'profileEmpty',
@@ -393,6 +396,7 @@ export function Explore({
     suggestedUsersIsLoading,
     suggestedUsersIsRefetching,
     suggestedUsersError,
+    selectedInterest,
   ])
   const suggestedFeedsModule = useMemo(() => {
     const i: ExploreScreenItems[] = []
@@ -603,18 +607,7 @@ export function Explore({
       switch (item.type) {
         case 'topBorder':
           return (
-            <View
+            <View style={[a.w_full, t.atoms.border_contrast_low, a.border_t]} />
-              style={[
-                a.w_full,
-                t.atoms.border_contrast_low,
-                a.border_t,
-                headerHeight &&
-                  web({
-                    position: 'sticky',
-                    top: headerHeight,
-                  }),
-              ]}
-            />
           )
         case 'header': {
           return (
@@ -800,7 +793,6 @@ export function Explore({
         case 'preview:header': {
           return (
             <ModuleHeader.Container
-              headerHeight={headerHeight}
               style={[
                 a.pt_xs,
                 t.atoms.border_contrast_low,
@@ -888,7 +880,6 @@ export function Explore({
       selectedInterest,
       _,
       fetchNextPageFeedPreviews,
-      headerHeight,
     ],
   )
 

src/screens/Search/components/ModuleHeader.tsx

@@ -6,7 +6,7 @@ import {PressableScale} from '#/lib/custom-animations/PressableScale'
 import {makeCustomFeedLink} from '#/lib/routes/links'
 import {logger} from '#/logger'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, native, useTheme, type ViewStyleProp, web} from '#/alf'
+import {atoms as a, native, useTheme, type ViewStyleProp} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
 import * as FeedCard from '#/components/FeedCard'
 import {sizes as iconSizes} from '#/components/icons/common'
@@ -17,11 +17,9 @@ import {Text, type TextProps} from '#/components/Typography'
 export function Container({
   style,
   children,
-  headerHeight,
   bottomBorder,
 }: {
   children: React.ReactNode
-  headerHeight?: number
   bottomBorder?: boolean
 } & ViewStyleProp) {
   const t = useTheme()
@@ -35,7 +33,6 @@ export function Container({
         a.pb_md,
         a.gap_sm,
         t.atoms.bg,
-        headerHeight && web({position: 'sticky', top: headerHeight}),
         bottomBorder && [a.border_b, t.atoms.border_contrast_low],
         style,
       ]}>