Simplify ListItems header rendering

bluesky-social · Nov 1, 2023 · 0525ce0 · 0525ce0
1 parent 4ce013b
commit 0525ce0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/view/com/lists/ListItems.tsx b/src/view/com/lists/ListItems.tsx
@@ -22,7 +22,6 @@ import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
 import {s} from 'lib/styles'
 import {OnScrollCb} from 'lib/hooks/useOnMainScroll'
 
-const HEADER_ITEM = {_reactKey: '__header__'}
 const LOADING_ITEM = {_reactKey: '__loading__'}
 const EMPTY_ITEM = {_reactKey: '__empty__'}
 const ERROR_ITEM = {_reactKey: '__error__'}
@@ -60,7 +59,7 @@ export const ListItems = observer(function ListItemsImpl({
   const {isMobile} = useWebMediaQueries()
 
   const data = React.useMemo(() => {
-    let items: any[] = [HEADER_ITEM]
+    let items: any[] = []
     if (list.hasLoaded) {
       if (list.hasError) {
         items = items.concat([ERROR_ITEM])
@@ -156,9 +155,7 @@ export const ListItems = observer(function ListItemsImpl({
 
   const renderItem = React.useCallback(
     ({item}: {item: any}) => {
-      if (item === HEADER_ITEM) {
-        return renderHeader()
-      } else if (item === EMPTY_ITEM) {
+      if (item === EMPTY_ITEM) {
         return renderEmptyState()
       } else if (item === ERROR_ITEM) {
         return (
@@ -190,7 +187,6 @@ export const ListItems = observer(function ListItemsImpl({
     },
     [
       renderMemberButton,
-      renderHeader,
       renderEmptyState,
       list.error,
       onPressTryAgain,
@@ -216,6 +212,7 @@ export const ListItems = observer(function ListItemsImpl({
         data={data}
         keyExtractor={(item: any) => item._reactKey}
         renderItem={renderItem}
+        ListHeaderComponent={renderHeader}
         ListFooterComponent={Footer}
         refreshControl={
           <RefreshControl

diff --git a/src/view/com/profile/ProfileCard.tsx b/src/view/com/profile/ProfileCard.tsx
@@ -96,7 +96,7 @@ export const ProfileCard = observer(function ProfileCardImpl({
             {profile.description as string}
           </Text>
         </View>
-      ) : undefined}
+      ) : null}
       <FollowersList followers={followers} />
     </Link>
   )

diff --git a/src/view/screens/ProfileList.tsx b/src/view/screens/ProfileList.tsx
@@ -673,7 +673,7 @@ const AboutSection = React.forwardRef<SectionRef, AboutSectionProps>(
 
     const renderHeader = React.useCallback(() => {
       if (!list.data) {
-        return null
+        return <View />
       }
       return (
         <View>