diff --git a/app/navigation/BottomTabBar.tsx b/app/navigation/BottomTabBar.tsx index 9afc99b..bf4e3f3 100644 --- a/app/navigation/BottomTabBar.tsx +++ b/app/navigation/BottomTabBar.tsx @@ -32,14 +32,14 @@ const icons: { [key: string]: TabButtonImage } = { }, } -const BottomTabButton: React.FC<{ +const BottomTabButton = React.memo<{ routeKey: string label: string name: string isFocused: boolean img: TabButtonImage navigation: any -}> = ({ routeKey, label, name, isFocused, img, navigation }) => { +}>(({ routeKey, label, name, isFocused, img, navigation }) => { const onPress = () => { const event = navigation.emit({ type: 'tabPress', @@ -69,8 +69,7 @@ const BottomTabButton: React.FC<{ ) -} -const MemoBottomTabButton = React.memo(BottomTabButton) +}) const BottomTabBar: React.FC = ({ state, descriptors, navigation }) => { return ( @@ -87,7 +86,7 @@ const BottomTabBar: React.FC = ({ state, descriptors, navigat : route.name return ( - = ({ album }) => { +}>(({ album }) => { const navigation = useNavigation() return ( @@ -34,13 +34,12 @@ const AlbumItem: React.FC<{ ) -} -const MemoAlbumItem = React.memo(AlbumItem) +}) -const Category: React.FC<{ +const Category = React.memo<{ name: string type: string -}> = ({ name, type }) => { +}>(({ name, type }) => { const state = albumLists[type] const list = useAtomValue(state.listAtom) const updating = useAtomValue(state.updatingAtom) @@ -58,22 +57,21 @@ const Category: React.FC<{ style={styles.artScroll} contentContainerStyle={styles.artScrollContent}> {list.map(album => ( - + ))} ) -} -const MemoCategory = React.memo(Category) +}) const Home = () => ( - - - - - + + + + + ) diff --git a/app/screens/LibraryAlbums.tsx b/app/screens/LibraryAlbums.tsx index 967c3b7..3898df0 100644 --- a/app/screens/LibraryAlbums.tsx +++ b/app/screens/LibraryAlbums.tsx @@ -10,14 +10,14 @@ import { useAtomValue } from 'jotai/utils' import React, { useEffect } from 'react' import { StyleSheet, Text, useWindowDimensions, View } from 'react-native' -const AlbumItem: React.FC<{ +const AlbumItem = React.memo<{ id: string name: string size: number height: number artist?: string coverArtUri?: string -}> = ({ id, name, artist, size, height, coverArtUri }) => { +}>(({ id, name, artist, size, height, coverArtUri }) => { const navigation = useNavigation() return ( @@ -35,13 +35,12 @@ const AlbumItem: React.FC<{ ) -} -const MemoAlbumItem = React.memo(AlbumItem) +}) const AlbumListRenderItem: React.FC<{ item: { album: Album; size: number; height: number } }> = ({ item }) => ( -