Scroll to toot working

src/@types/app.d.ts

@@ -19,10 +19,10 @@ declare namespace App {
     Pages,
     {
       page: Pages
-      hashtag?: string
+      hashtag?: Mastodon.Tag['name']
-      list?: string
+      list?: Mastodon.List['id']
-      toot?: string
+      toot?: Mastodon.Status
-      account?: string
+      account?: Mastodon.Account['id']
     }
   ]
 }

src/components/Button/ButtonRound.tsx

@@ -7,7 +7,7 @@ import { useTheme } from 'src/utils/styles/ThemeManager'
 export interface Props {
   styles: any
   onPress: () => void
-  icon: string
+  icon: any
   size?: 'S' | 'M' | 'L'
   coordinate?: 'center' | 'default'
 }

src/components/Button/ButtonRow.tsx

@@ -12,13 +12,13 @@ type PropsBase = {
 
 export interface PropsText extends PropsBase {
   text: string
-  icon?: string
+  icon?: any
   size?: 'S' | 'M' | 'L'
 }
 
 export interface PropsIcon extends PropsBase {
   text?: string
-  icon: string
+  icon: any
   size?: 'S' | 'M' | 'L'
 }
 

src/components/Header/Left.tsx

@@ -8,7 +8,7 @@ import { StyleConstants } from 'src/utils/styles/constants'
 export interface Props {
   onPress: () => void
   text?: string
-  icon?: string
+  icon?: any
 }
 
 const HeaderLeft: React.FC<Props> = ({ onPress, text, icon }) => {
@@ -38,9 +38,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default React.memo(HeaderLeft, (prev, next) => {
+export default HeaderLeft
-  let skipUpdate = true
-  skipUpdate = prev.text === next.text
-  skipUpdate = prev.icon === next.icon
-  return skipUpdate
-})

src/components/Header/Right.tsx

@@ -12,12 +12,12 @@ type PropsBase = {
 
 export interface PropsText extends PropsBase {
   text: string
-  icon?: string
+  icon?: any
 }
 
 export interface PropsIcon extends PropsBase {
   text?: string
-  icon: string
+  icon: any
 }
 
 const HeaderRight: React.FC<PropsText | PropsIcon> = ({
@@ -60,10 +60,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default React.memo(HeaderRight, (prev, next) => {
+export default HeaderRight
-  let skipUpdate = true
-  skipUpdate = prev.disabled === next.disabled
-  skipUpdate = prev.text === next.text
-  skipUpdate = prev.icon === next.icon
-  return skipUpdate
-})

src/components/Menu/Row.tsx

@@ -7,7 +7,7 @@ import { ColorDefinitions } from 'src/utils/styles/themes'
 import { StyleConstants } from 'src/utils/styles/constants'
 
 export interface Props {
-  iconFront?: string
+  iconFront?: any
   iconFrontColor?: ColorDefinitions
   title: string
   content?: string

src/components/NetworkState/Error.tsx

@@ -1,20 +0,0 @@
-import React from 'react'
-import { StyleSheet, Text, View } from 'react-native'
-
-const NetworkStateError = () => {
-  return (
-    <View style={styles.base}>
-      <Text>加载错误</Text>
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  base: {
-    flex: 1,
-    // justifyContent: 'center',
-    alignItems: 'center'
-  }
-})
-
-export default NetworkStateError

src/components/Timelines/Timeline.tsx

@@ -1,12 +1,5 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useEffect, useRef } from 'react'
-import {
+import { ActivityIndicator, AppState, FlatList, StyleSheet } from 'react-native'
-  ActivityIndicator,
-  AppState,
-  FlatList,
-  StyleSheet,
-  Text,
-  View
-} from 'react-native'
 import { setFocusHandler, useInfiniteQuery } from 'react-query'
 
 import TimelineNotifications from 'src/components/Timelines/Timeline/Notifications'
@@ -14,14 +7,13 @@ import TimelineDefault from 'src/components/Timelines/Timeline/Default'
 import TimelineConversation from 'src/components/Timelines/Timeline/Conversation'
 import { timelineFetch } from 'src/utils/fetches/timelineFetch'
 import TimelineSeparator from './Timeline/Separator'
-
+import TimelineEmpty from './Timeline/Empty'
-// Opening nesting hashtag pages
 
 export interface Props {
   page: App.Pages
   hashtag?: string
   list?: string
-  toot?: string
+  toot?: Mastodon.Status
   account?: string
   disableRefresh?: boolean
   scrollEnabled?: boolean
@@ -48,15 +40,28 @@ const Timeline: React.FC<Props> = ({
 
   const queryKey: App.QueryKey = [page, { page, hashtag, list, toot, account }]
   const {
-    isLoading,
-    isFetchingMore,
-    isError,
     isSuccess,
+    isLoading,
+    isError,
+    isFetchingMore,
     data,
-    fetchMore
+    fetchMore,
+    refetch
   } = useInfiniteQuery(queryKey, timelineFetch)
   const flattenData = data ? data.flatMap(d => [...d?.toots]) : []
-  // const flattenPointer = data ? data.flatMap(d => [d?.pointer]) : []
+  const flattenPointer = data ? data.flatMap(d => [d?.pointer]) : []
+
+  const flRef = useRef<FlatList>(null)
+  useEffect(() => {
+    if (toot && isSuccess) {
+      setTimeout(() => {
+        flRef.current?.scrollToIndex({
+          index: flattenPointer[0],
+          viewOffset: 100
+        })
+      }, 500)
+    }
+  }, [isSuccess])
 
   const flKeyExtrator = useCallback(({ id }) => id, [])
   const flRenderItem = useCallback(({ item }) => {
@@ -80,7 +85,7 @@ const Timeline: React.FC<Props> = ({
         },
         { previous: true }
       ),
-    [disableRefresh, flattenData]
+    [flattenData]
   )
   const flOnEndReach = useCallback(
     () =>
@@ -89,37 +94,49 @@ const Timeline: React.FC<Props> = ({
         direction: 'next',
         id: flattenData[flattenData.length - 1].id
       }),
-    [disableRefresh, flattenData]
+    [flattenData]
   )
-
+  const flFooter = useCallback(() => {
-  let content
+    if (isFetchingMore) {
-  if (!isSuccess) {
+      return <ActivityIndicator />
-    content = <ActivityIndicator />
+    } else {
-  } else if (isError) {
+      return null
-    content = <Text>Error message</Text>
+    }
-  } else {
+  }, [isFetchingMore])
-    content = (
+  const onScrollToIndexFailed = useCallback(error => {
-      <>
+    const offset = error.averageItemLength * error.index
-        <FlatList
+    flRef.current?.scrollToOffset({ offset })
-          data={flattenData}
+    setTimeout(
-          onRefresh={flOnRefresh}
+      () =>
-          renderItem={flRenderItem}
+        flRef.current?.scrollToIndex({ index: error.index, viewOffset: 100 }),
-          onEndReached={flOnEndReach}
+      350
-          keyExtractor={flKeyExtrator}
-          style={styles.flatList}
-          scrollEnabled={scrollEnabled} // For timeline in Account view
-          ItemSeparatorComponent={flItemSeparatorComponent}
-          refreshing={!disableRefresh && isLoading}
-          onEndReachedThreshold={!disableRefresh ? 1 : null}
-          // require getItemLayout
-          // {...(flattenPointer[0] && { initialScrollIndex: flattenPointer[0] })}
-        />
-        {isFetchingMore && <ActivityIndicator />}
-      </>
     )
-  }
+  }, [])
 
-  return <View>{content}</View>
+  return (
+    <FlatList
+      ref={flRef}
+      data={flattenData}
+      style={styles.flatList}
+      onRefresh={flOnRefresh}
+      renderItem={flRenderItem}
+      onEndReached={flOnEndReach}
+      keyExtractor={flKeyExtrator}
+      ListFooterComponent={flFooter}
+      scrollEnabled={scrollEnabled} // For timeline in Account view
+      ItemSeparatorComponent={flItemSeparatorComponent}
+      onEndReachedThreshold={!disableRefresh ? 0.75 : null}
+      refreshing={!disableRefresh && isLoading && flattenData.length > 0}
+      ListEmptyComponent={
+        <TimelineEmpty
+          isLoading={isLoading}
+          isError={isError}
+          refetch={refetch}
+        />
+      }
+      {...(toot && isSuccess && { onScrollToIndexFailed })}
+    />
+  )
 }
 
 const styles = StyleSheet.create({

src/components/Timelines/Timeline/Conversation.tsx

@@ -2,9 +2,9 @@ import React, { useMemo } from 'react'
 import { Pressable, StyleSheet, View } from 'react-native'
 import { useNavigation } from '@react-navigation/native'
 
-import Avatar from './Shared/Avatar'
+import TimelineAvatar from './Shared/Avatar'
 import HeaderConversation from './Shared/HeaderConversation'
-import Content from './Shared/Content'
+import TimelineContent from './Shared/Content'
 import { StyleConstants } from 'src/utils/styles/constants'
 
 export interface Props {
@@ -18,7 +18,7 @@ const TimelineConversation: React.FC<Props> = ({ item }) => {
     return (
       <View style={styles.statusView}>
         <View style={styles.status}>
-          <Avatar uri={item.accounts[0].avatar} id={item.accounts[0].id} />
+          <TimelineAvatar uri={item.accounts[0].avatar} id={item.accounts[0].id} />
           <View style={styles.details}>
             <HeaderConversation
               account={item.accounts[0]}
@@ -34,7 +34,7 @@ const TimelineConversation: React.FC<Props> = ({ item }) => {
               }
             >
               {item.last_status ? (
-                <Content
+                <TimelineContent
                   content={item.last_status.content}
                   emojis={item.last_status.emojis}
                   mentions={item.last_status.mentions}

src/components/Timelines/Timeline/Default.tsx

@@ -32,7 +32,7 @@ const TimelineDefault: React.FC<Props> = ({ item, queryKey }) => {
   const pressableToot = useCallback(
     () =>
       navigation.navigate('Screen-Shared-Toot', {
-        toot: actualStatus.id
+        toot: actualStatus
       }),
     []
   )

src/components/Timelines/Timeline/Empty.tsx

@@ -0,0 +1,49 @@
+import { Feather } from '@expo/vector-icons'
+import React from 'react'
+import { ActivityIndicator, StyleSheet, Text, View } from 'react-native'
+import { ButtonRow } from 'src/components/Button'
+import { StyleConstants } from 'src/utils/styles/constants'
+import { useTheme } from 'src/utils/styles/ThemeManager'
+
+export interface Props {
+  isLoading: boolean
+  isError: boolean
+  refetch: () => void
+}
+
+const TimelineEmpty: React.FC<Props> = ({ isLoading, isError, refetch }) => {
+  const { theme } = useTheme()
+
+  return (
+    <View style={styles.base}>
+      {isLoading && <ActivityIndicator />}
+      {isError && (
+        <>
+          <Feather
+            name='frown'
+            size={StyleConstants.Font.Size.L}
+            color={theme.primary}
+          />
+          <Text style={[styles.error, { color: theme.primary }]}>加载错误</Text>
+          <ButtonRow text='重试' onPress={() => refetch()} />
+        </>
+      )}
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  base: {
+    flex: 1,
+    minHeight: '100%',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  error: {
+    fontSize: StyleConstants.Font.Size.M,
+    marginTop: StyleConstants.Spacing.S,
+    marginBottom: StyleConstants.Spacing.L
+  }
+})
+
+export default TimelineEmpty

src/screens/Shared/Toot.tsx

@@ -2,12 +2,10 @@ import React from 'react'
 
 import Timeline from 'src/components/Timelines/Timeline'
 
-// Show remote hashtag? Only when private, show local version?
-
 export interface Props {
   route: {
     params: {
-      toot: string
+      toot: Mastodon.Status
     }
   }
 }

src/utils/fetches/timelineFetch.ts

@@ -12,14 +12,14 @@ export const timelineFetch = async (
     list,
     toot
   }: {
-    page: string
+    page: App.Pages
     params?: {
       [key: string]: string | number | boolean
     }
-    account?: string
+    hashtag?: Mastodon.Tag['name']
-    hashtag?: string
+    list?: Mastodon.List['id']
-    list?: string
+    toot?: Mastodon.Status
-    toot?: string
+    account?: Mastodon.Account['id']
   },
   pagination: {
     direction: 'prev' | 'next'
@@ -173,23 +173,14 @@ export const timelineFetch = async (
       return Promise.resolve({ toots: res.body, pointer: null })
 
     case 'Toot':
-      const current = await client({
+      res = await client({
         method: 'get',
         instance: 'local',
-        url: `statuses/${toot}`
+        url: `statuses/${toot!.id}/context`
-      })
-      const context = await client({
-        method: 'get',
-        instance: 'local',
-        url: `statuses/${toot}/context`
       })
       return Promise.resolve({
-        toots: [
+        toots: [...res.body.ancestors, toot, ...res.body.descendants],
-          ...context.body.ancestors,
+        pointer: res.body.ancestors.length
-          current.body,
-          ...context.body.descendants
-        ],
-        pointer: context.body.ancestors.length
       })
 
     default: