octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fix #558 #602

Browse Source
This commit is contained in:
xmflsct
2022-12-31 00:07:28 +01:00
parent 49a0e6d63e
commit b677c4b7ce
17 changed files with 290 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Separator.tsx
View File

@ -1,7 +1,7 @@
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
import { StyleProp, View, ViewStyle } from 'react-native'
export interface Props {
extraMarginLeft?: number
@ -23,7 +23,7 @@ const ComponentSeparator: React.FC<Props> = ({
{
backgroundColor: colors.backgroundDefault,
borderTopColor: colors.border,
borderTopWidth: StyleSheet.hairlineWidth,
borderTopWidth: 1,
marginLeft: StyleConstants.Spacing.Global.PagePadding + extraMarginLeft,
marginRight: StyleConstants.Spacing.Global.PagePadding + extraMarginRight
}

3
src/components/Timeline/Shared/Actions.tsx
View File

@ -329,8 +329,7 @@ const styles = StyleSheet.create({
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
minHeight: StyleConstants.Font.Size.L + StyleConstants.Spacing.S * 3,
marginHorizontal: StyleConstants.Spacing.S
paddingVertical: StyleConstants.Spacing.S * 1.5
}
})

4
src/components/Timeline/Shared/Card.tsx
View File

@ -10,7 +10,7 @@ import { useStatusQuery } from '@utils/queryHooks/status'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React, { useContext, useEffect, useState } from 'react'
import { Pressable, StyleSheet, View } from 'react-native'
import { Pressable, View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import TimelineDefault from '../Default'
import StatusContext from './Context'
@ -192,7 +192,7 @@ const TimelineCard: React.FC = () => {
flex: 1,
flexDirection: 'row',
marginTop: StyleConstants.Spacing.M,
borderWidth: StyleSheet.hairlineWidth,
borderWidth: 1,
borderRadius: StyleConstants.Spacing.S,
overflow: 'hidden',
borderColor: colors.border

5
src/components/Timeline/index.tsx
View File

@ -2,6 +2,7 @@ import ComponentSeparator from '@components/Separator'
import { useScrollToTop } from '@react-navigation/native'
import { UseInfiniteQueryOptions } from '@tanstack/react-query'
import { QueryKeyTimeline, useTimelineQuery } from '@utils/queryHooks/timeline'
import { flattenPages } from '@utils/queryHooks/utils'
import { useGlobalStorageListener } from '@utils/storage/actions'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
@ -54,8 +55,6 @@ const Timeline: React.FC<Props> = ({
}
})
const flattenData = data?.pages ? data.pages?.flatMap(page => [...page.body]) : []
const flRef = useRef<FlatList>(null)
const scrollY = useSharedValue(0)
@ -112,7 +111,7 @@ const Timeline: React.FC<Props> = ({
scrollEventThrottle={16}
onScroll={onScroll}
windowSize={7}
data={flattenData}
data={flattenPages(data)}
initialNumToRender={6}
maxToRenderPerBatch={3}
onEndReached={() => !disableInfinity && !isFetchingNextPage && fetchNextPage()}

2
src/components/contextMenu/status.ts
View File

@ -203,7 +203,7 @@ const menuStatus = ({
}),
disabled: false,
destructive: false,
hidden: !ownAccount && !status.mentions.filter(mention => mention.id === accountId).length
hidden: !ownAccount && !status.mentions?.filter(mention => mention.id === accountId).length
},
title: t('componentContextMenu:status.mute.action', {
defaultValue: 'false',