Clean up react memo

This commit is contained in:
Zhiyuan Zheng 2022-04-30 21:47:17 +02:00
parent f93d6f7db8
commit 293447f65c
8 changed files with 93 additions and 82 deletions

View File

@ -144,19 +144,23 @@ const TimelineActioned = React.memo(
} }
}, []) }, [])
return <View style={styles.actioned} children={children} /> return (
}, <View
() => true style={{
)
const styles = StyleSheet.create({
actioned: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
marginBottom: StyleConstants.Spacing.S, marginBottom: StyleConstants.Spacing.S,
paddingLeft: StyleConstants.Avatar.M - StyleConstants.Font.Size.S, paddingLeft: StyleConstants.Avatar.M - StyleConstants.Font.Size.S,
paddingRight: StyleConstants.Spacing.Global.PagePadding paddingRight: StyleConstants.Spacing.Global.PagePadding
}}
children={children}
/>
)
}, },
() => true
)
const styles = StyleSheet.create({
icon: { icon: {
marginRight: StyleConstants.Spacing.S marginRight: StyleConstants.Spacing.S
} }

View File

@ -2,6 +2,8 @@ import analytics from '@components/analytics'
import Icon from '@components/Icon' import Icon from '@components/Icon'
import { displayMessage } from '@components/Message' import { displayMessage } from '@components/Message'
import { useNavigation } from '@react-navigation/native' import { useNavigation } from '@react-navigation/native'
import { StackNavigationProp } from '@react-navigation/stack'
import { RootStackParamList } from '@utils/navigation/navigators'
import { import {
MutationVarsTimelineUpdateStatusProperty, MutationVarsTimelineUpdateStatusProperty,
QueryKeyTimeline, QueryKeyTimeline,
@ -31,7 +33,7 @@ const TimelineActions: React.FC<Props> = ({
accts, accts,
reblog reblog
}) => { }) => {
const navigation = useNavigation() const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
const { t } = useTranslation('componentTimeline') const { t } = useTranslation('componentTimeline')
const { colors, theme } = useTheme() const { colors, theme } = useTheme()
const iconColor = colors.secondary const iconColor = colors.secondary

View File

@ -50,8 +50,7 @@ const TimelineAvatar = React.memo(
}} }}
/> />
) )
}, }
() => true
) )
export default TimelineAvatar export default TimelineAvatar

View File

@ -8,11 +8,13 @@ import React from 'react'
import { Pressable, StyleSheet, Text, View } from 'react-native' import { Pressable, StyleSheet, Text, View } from 'react-native'
export interface Props { export interface Props {
card: Mastodon.Card card: Pick<
Mastodon.Card,
'url' | 'image' | 'blurhash' | 'title' | 'description'
>
} }
const TimelineCard = React.memo( const TimelineCard = React.memo(({ card }: Props) => {
({ card }: Props) => {
const { colors } = useTheme() const { colors } = useTheme()
const navigation = useNavigation() const navigation = useNavigation()
@ -46,10 +48,7 @@ const TimelineCard = React.memo(
{card.description ? ( {card.description ? (
<Text <Text
numberOfLines={1} numberOfLines={1}
style={[ style={[styles.rightDescription, { color: colors.primaryDefault }]}
styles.rightDescription,
{ color: colors.primaryDefault }
]}
testID='description' testID='description'
> >
{card.description} {card.description}
@ -64,9 +63,7 @@ const TimelineCard = React.memo(
</View> </View>
</Pressable> </Pressable>
) )
}, })
() => true
)
const styles = StyleSheet.create({ const styles = StyleSheet.create({
card: { card: {

View File

@ -5,10 +5,10 @@ import { useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux' import { useSelector } from 'react-redux'
export interface Props { export interface Props {
status: Pick<Mastodon.Status, 'content' | 'spoiler_text' | 'emojis'> & { status: Pick<
mentions?: Mastodon.Status['mentions'] Mastodon.Status,
tags?: Mastodon.Status['tags'] 'content' | 'spoiler_text' | 'emojis' | 'mentions' | 'tags'
} >
numberOfLines?: number numberOfLines?: number
highlighted?: boolean highlighted?: boolean
disableDetails?: boolean disableDetails?: boolean
@ -72,7 +72,9 @@ const TimelineContent = React.memo(
</> </>
) )
}, },
(prev, next) => prev.status.content === next.status.content (prev, next) =>
prev.status.content === next.status.content &&
prev.status.spoiler_text === next.status.spoiler_text
) )
export default TimelineContent export default TimelineContent

View File

@ -10,7 +10,10 @@ import { useTranslation } from 'react-i18next'
import { StyleSheet, Text, View } from 'react-native' import { StyleSheet, Text, View } from 'react-native'
export interface Props { export interface Props {
status: Mastodon.Status status: Pick<
Mastodon.Status,
'id' | 'edited_at' | 'reblogs_count' | 'favourites_count'
>
highlighted: boolean highlighted: boolean
} }
@ -125,6 +128,7 @@ const TimelineFeedback = React.memo(
) )
}, },
(prev, next) => (prev, next) =>
prev.status.edited_at === next.status.edited_at &&
prev.status.reblogs_count === next.status.reblogs_count && prev.status.reblogs_count === next.status.reblogs_count &&
prev.status.favourites_count === next.status.favourites_count prev.status.favourites_count === next.status.favourites_count
) )

View File

@ -37,7 +37,7 @@ const HeaderSharedCreated = React.memo(
</> </>
) )
}, },
() => true (prev, next) => prev.edited_at === next.edited_at
) )
export default HeaderSharedCreated export default HeaderSharedCreated

View File

@ -7,13 +7,16 @@ import { useTheme } from '@utils/styles/ThemeManager'
import * as Localization from 'expo-localization' import * as Localization from 'expo-localization'
import React, { useState } from 'react' import React, { useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Pressable, StyleSheet, Text } from 'react-native' import { Pressable, Text } from 'react-native'
import { Circle } from 'react-native-animated-spinkit' import { Circle } from 'react-native-animated-spinkit'
import { useSelector } from 'react-redux' import { useSelector } from 'react-redux'
export interface Props { export interface Props {
highlighted: boolean highlighted: boolean
status: Mastodon.Status status: Pick<
Mastodon.Status,
'language' | 'spoiler_text' | 'content' | 'emojis'
>
} }
const TimelineTranslate = React.memo( const TimelineTranslate = React.memo(
@ -60,7 +63,12 @@ const TimelineTranslate = React.memo(
return ( return (
<> <>
<Pressable <Pressable
style={[styles.button, { paddingBottom: isSuccess ? 0 : undefined }]} style={{
flexDirection: 'row',
alignItems: 'center',
paddingVertical: StyleConstants.Spacing.S,
paddingBottom: isSuccess ? 0 : undefined
}}
onPress={() => { onPress={() => {
if (enabled) { if (enabled) {
if (!isSuccess) { if (!isSuccess) {
@ -128,15 +136,10 @@ const TimelineTranslate = React.memo(
</> </>
) )
}, },
() => true (prev, next) =>
prev.status.language === next.status.language &&
prev.status.content === next.status.content &&
prev.status.spoiler_text === next.status.spoiler_text
) )
const styles = StyleSheet.create({
button: {
flexDirection: 'row',
alignItems: 'center',
paddingVertical: StyleConstants.Spacing.S
}
})
export default TimelineTranslate export default TimelineTranslate