1 files changed, 43 insertions, 94 deletions

diff --git a/src/view/com/lists/ListsList.tsx b/src/view/com/lists/ListsList.tsx
index 4c8befa1f..efc874ef3 100644
--- a/src/view/com/lists/ListsList.tsx
+++ b/src/view/com/lists/ListsList.tsx
@@ -1,57 +1,44 @@
-import React, {MutableRefObject} from 'react'
+import React from 'react'
 import {
+  ActivityIndicator,
+  FlatList as RNFlatList,
   RefreshControl,
   StyleProp,
   StyleSheet,
   View,
   ViewStyle,
-  FlatList,
 } from 'react-native'
 import {observer} from 'mobx-react-lite'
-import {
-  FontAwesomeIcon,
-  FontAwesomeIconStyle,
-} from '@fortawesome/react-native-fontawesome'
 import {AppBskyGraphDefs as GraphDefs} from '@atproto/api'
 import {ListCard} from './ListCard'
-import {ProfileCardFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
 import {ErrorMessage} from '../util/error/ErrorMessage'
 import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
-import {Button} from '../util/forms/Button'
 import {Text} from '../util/text/Text'
 import {ListsListModel} from 'state/models/lists/lists-list'
 import {useAnalytics} from 'lib/analytics/analytics'
 import {usePalette} from 'lib/hooks/usePalette'
+import {FlatList} from '../util/Views.web'
 import {s} from 'lib/styles'
 
-const LOADING_ITEM = {_reactKey: '__loading__'}
-const CREATENEW_ITEM = {_reactKey: '__loading__'}
-const EMPTY_ITEM = {_reactKey: '__empty__'}
+const LOADING = {_reactKey: '__loading__'}
+const EMPTY = {_reactKey: '__empty__'}
 const ERROR_ITEM = {_reactKey: '__error__'}
 const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'}
 
 export const ListsList = observer(function ListsListImpl({
   listsList,
-  showAddBtns,
+  inline,
   style,
-  scrollElRef,
   onPressTryAgain,
-  onPressCreateNew,
   renderItem,
-  renderEmptyState,
   testID,
-  headerOffset = 0,
 }: {
   listsList: ListsListModel
-  showAddBtns?: boolean
+  inline?: boolean
   style?: StyleProp<ViewStyle>
-  scrollElRef?: MutableRefObject<FlatList<any> | null>
-  onPressCreateNew: () => void
   onPressTryAgain?: () => void
-  renderItem?: (list: GraphDefs.ListView) => JSX.Element
-  renderEmptyState?: () => JSX.Element
+  renderItem?: (list: GraphDefs.ListView, index: number) => JSX.Element
   testID?: string
-  headerOffset?: number
 }) {
   const pal = usePalette('default')
   const {track} = useAnalytics()
@@ -59,33 +46,27 @@ export const ListsList = observer(function ListsListImpl({
 
   const data = React.useMemo(() => {
     let items: any[] = []
-    if (listsList.hasLoaded) {
-      if (listsList.hasError) {
-        items = items.concat([ERROR_ITEM])
-      }
-      if (listsList.isEmpty) {
-        items = items.concat([EMPTY_ITEM])
-      } else {
-        if (showAddBtns) {
-          items = items.concat([CREATENEW_ITEM])
-        }
-        items = items.concat(listsList.lists)
-      }
-      if (listsList.loadMoreError) {
-        items = items.concat([LOAD_MORE_ERROR_ITEM])
-      }
-    } else if (listsList.isLoading) {
-      items = items.concat([LOADING_ITEM])
+    if (listsList.hasError) {
+      items = items.concat([ERROR_ITEM])
+    }
+    if (!listsList.hasLoaded && listsList.isLoading) {
+      items = items.concat([LOADING])
+    } else if (listsList.isEmpty) {
+      items = items.concat([EMPTY])
+    } else {
+      items = items.concat(listsList.lists)
+    }
+    if (listsList.loadMoreError) {
+      items = items.concat([LOAD_MORE_ERROR_ITEM])
     }
     return items
   }, [
     listsList.hasError,
     listsList.hasLoaded,
     listsList.isLoading,
-    listsList.isEmpty,
     listsList.lists,
+    listsList.isEmpty,
     listsList.loadMoreError,
-    showAddBtns,
   ])
 
   // events
@@ -119,14 +100,15 @@ export const ListsList = observer(function ListsListImpl({
   // =
 
   const renderItemInner = React.useCallback(
-    ({item}: {item: any}) => {
-      if (item === EMPTY_ITEM) {
-        if (renderEmptyState) {
-          return renderEmptyState()
-        }
-        return <View />
-      } else if (item === CREATENEW_ITEM) {
-        return <CreateNewItem onPress={onPressCreateNew} />
+    ({item, index}: {item: any; index: number}) => {
+      if (item === EMPTY) {
+        return (
+          <View
+            testID="listsEmpty"
+            style={[{padding: 18, borderTopWidth: 1}, pal.border]}>
+            <Text style={pal.textLight}>You have no lists.</Text>
+          </View>
+        )
       } else if (item === ERROR_ITEM) {
         return (
           <ErrorMessage
@@ -141,11 +123,15 @@ export const ListsList = observer(function ListsListImpl({
             onPress={onPressRetryLoadMore}
           />
         )
-      } else if (item === LOADING_ITEM) {
-        return <ProfileCardFeedLoadingPlaceholder />
+      } else if (item === LOADING) {
+        return (
+          <View style={{padding: 20}}>
+            <ActivityIndicator />
+          </View>
+        )
       }
       return renderItem ? (
-        renderItem(item)
+        renderItem(item, index)
       ) : (
         <ListCard
           list={item}
@@ -154,24 +140,17 @@ export const ListsList = observer(function ListsListImpl({
         />
       )
     },
-    [
-      listsList,
-      onPressTryAgain,
-      onPressRetryLoadMore,
-      onPressCreateNew,
-      renderItem,
-      renderEmptyState,
-    ],
+    [listsList, onPressTryAgain, onPressRetryLoadMore, renderItem, pal],
   )
 
+  const FlatListCom = inline ? RNFlatList : FlatList
   return (
     <View testID={testID} style={style}>
       {data.length > 0 && (
-        <FlatList
+        <FlatListCom
           testID={testID ? `${testID}-flatlist` : undefined}
-          ref={scrollElRef}
           data={data}
-          keyExtractor={item => item._reactKey}
+          keyExtractor={(item: any) => item._reactKey}
           renderItem={renderItemInner}
           refreshControl={
             <RefreshControl
@@ -179,15 +158,12 @@ export const ListsList = observer(function ListsListImpl({
               onRefresh={onRefresh}
               tintColor={pal.colors.text}
               titleColor={pal.colors.text}
-              progressViewOffset={headerOffset}
             />
           }
           contentContainerStyle={[s.contentContainer]}
-          style={{paddingTop: headerOffset}}
           onEndReached={onEndReached}
           onEndReachedThreshold={0.6}
           removeClippedSubviews={true}
-          contentOffset={{x: 0, y: headerOffset * -1}}
           // @ts-ignore our .web version only -prf
           desktopFixedHeight
         />
@@ -196,36 +172,9 @@ export const ListsList = observer(function ListsListImpl({
   )
 })
 
-function CreateNewItem({onPress}: {onPress: () => void}) {
-  const pal = usePalette('default')
-
-  return (
-    <View style={[styles.createNewContainer]}>
-      <Button type="default" onPress={onPress} style={styles.createNewButton}>
-        <FontAwesomeIcon icon="plus" style={pal.text as FontAwesomeIconStyle} />
-        <Text type="button" style={pal.text}>
-          New Mute List
-        </Text>
-      </Button>
-    </View>
-  )
-}
-
 const styles = StyleSheet.create({
-  createNewContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingHorizontal: 18,
-    paddingTop: 18,
-    paddingBottom: 16,
-  },
-  createNewButton: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 8,
-  },
-  feedFooter: {paddingTop: 20},
   item: {
     paddingHorizontal: 18,
+    paddingVertical: 4,
   },
 })