Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: imporve performance using react hooks #499

Open
wants to merge 1 commit into
base: andrew_testing
Choose a base branch
from
Open

feat: imporve performance using react hooks #499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions client/screens/feed/Feed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useEffect, useMemo, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import {
Container,
Expand Down Expand Up @@ -197,22 +197,24 @@ const Feed = ({ feedType = 'public' }) => {
* @return {ReactNode} The rendered feed data.
*/
const renderData = () => {
let data = [];
const [data, setData] = useState([]);

if (feedType === 'public') {
if (selectedTypes?.pack) {
data = [...data, ...publicPacksData];
}
if (selectedTypes?.trip) {
data = [...data, ...publicTripsData];
useEffect(() => {
if (feedType === 'public') {
if (selectedTypes?.pack) {
setData((prev) => [...prev, ...publicPacksData]);
}
if (selectedTypes?.trip) {
setData((prev) => [...prev, ...publicTripsData]);
}
} else if (feedType === 'userPacks') {
setData(userPacksData);
} else if (feedType === 'userTrips') {
setData(userTripsData);
} else if (feedType === 'favoritePacks') {
setData(userPacksData.filter((pack) => pack.isFavorite));
}
} else if (feedType === 'userPacks') {
data = userPacksData;
} else if (feedType === 'userTrips') {
data = userTripsData;
} else if (feedType === 'favoritePacks') {
data = userPacksData.filter((pack) => pack.isFavorite);
}
}, [userPacksData, userTripsData, feedType]);

// Fuse search
const keys = ['name', 'items.name', 'items.category'];
Expand All @@ -225,14 +227,15 @@ const Feed = ({ feedType = 'public' }) => {
minMatchCharLength: 1,
};

const results =
feedType !== 'userTrips'
? fuseSearch(data, searchQuery, keys, options)
: data;

// Convert fuse results back into the format we want
// if searchQuery is empty, use the original data
data = searchQuery ? results.map((result) => result.item) : data;
const dataResult = useMemo(() => {
if (feedType !== 'userTrips' && searchQuery) {
console.log('searchQuery: ', searchQuery);
const result = fuseSearch(data, searchQuery, keys, options);
return result.map((result) => result.item);
} else {
return data;
}
}, [searchQuery, data]);

const feedSearchFilterComponent = (
<FeedSearchFilter
Expand All @@ -252,17 +255,16 @@ const Feed = ({ feedType = 'public' }) => {
contentContainerStyle={{ flex: 1, paddingBottom: 10 }}
>
<View style={styles.cardContainer}>
{console.log({ data })}
{feedSearchFilterComponent}
{data?.map((item) => (
{dataResult?.map((item) => (
<Card key={item._id} type={item.type} {...item} />
))}
</View>
</ScrollView>
) : (
<View style={{ flex: 1, paddingBottom: 10 }}>
<FlatList
data={data}
data={dataResult}
numColumns={1}
keyExtractor={(item) => item._id}
renderItem={({ item }) => (
Expand Down