verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] Searching for Discussion (#4843) 

* [FIX] Searching for Discussion

* minor tweak

* fixed pagination

* update typescript return

* remove await from load
This commit is contained in:
Reinaldo Neto 2023-03-16 20:30:58 -03:00 committed by GitHub
parent 87e86e819e
commit 5aaf7af5f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/definitions/rest/v1/chat.ts
View File

@ -33,6 +33,7 @@ export type ChatEndpoints = {
GET: (params: { roomId: IServerRoom['_id']; text?: string; offset: number; count: number }) => { GET: (params: { roomId: IServerRoom['_id']; text?: string; offset: number; count: number }) => {
messages: IMessageFromServer[]; messages: IMessageFromServer[];
total: number; total: number;
count: number;
}; };
}; };
'chat.getThreadsList': { 'chat.getThreadsList': {

33
app/views/DiscussionsView/index.tsx
View File

@ -1,4 +1,4 @@
import React, { useEffect, useLayoutEffect, useState } from 'react'; import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
import { FlatList, StyleSheet } from 'react-native'; import { FlatList, StyleSheet } from 'react-native';
import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack'; import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
import { HeaderBackButton } from '@react-navigation/elements'; import { HeaderBackButton } from '@react-navigation/elements';
@ -46,12 +46,13 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
const [discussions, setDiscussions] = useState<IMessageFromServer[]>([]); const [discussions, setDiscussions] = useState<IMessageFromServer[]>([]);
const [search, setSearch] = useState<IMessageFromServer[]>([]); const [search, setSearch] = useState<IMessageFromServer[]>([]);
const [isSearching, setIsSearching] = useState(false); const [isSearching, setIsSearching] = useState(false);
const [total, setTotal] = useState(0); const total = useRef(0);
const [searchTotal, setSearchTotal] = useState(0); const searchText = useRef('');
const offset = useRef(0);
const { colors } = useTheme(); const { colors } = useTheme();
const load = async (text = '') => { const load = async () => {
if (loading) { if (loading) {
return; return;
} }
@ -60,18 +61,18 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
try { try {
const result = await Services.getDiscussions({ const result = await Services.getDiscussions({
roomId: rid, roomId: rid,
offset: isSearching ? search.length : discussions.length, offset: offset.current,
count: API_FETCH_COUNT, count: API_FETCH_COUNT,
text text: searchText.current
}); });
if (result.success) { if (result.success) {
offset.current += result.count;
total.current = result.total;
if (isSearching) { if (isSearching) {
setSearch(result.messages); setSearch(prevState => (offset.current ? [...prevState, ...result.messages] : result.messages));
setSearchTotal(result.total);
} else { } else {
setDiscussions(result.messages); setDiscussions(result.messages);
setTotal(result.total);
} }
} }
setLoading(false); setLoading(false);
@ -81,15 +82,19 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
} }
}; };
const onSearchChangeText = useDebounce(async (text: string) => { const onSearchChangeText = useDebounce((text: string) => {
setIsSearching(true); setIsSearching(true);
await load(text); setSearch([]);
searchText.current = text;
offset.current = 0;
load();
}, 500); }, 500);
const onCancelSearchPress = () => { const onCancelSearchPress = () => {
setIsSearching(false); setIsSearching(false);
setSearch([]); setSearch([]);
setSearchTotal(0); searchText.current = '';
offset.current = 0;
}; };
const onSearchPress = () => { const onSearchPress = () => {
@ -181,12 +186,12 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
<FlatList <FlatList
data={isSearching ? search : discussions} data={isSearching ? search : discussions}
renderItem={renderItem} renderItem={renderItem}
keyExtractor={(item: any) => item.msg} keyExtractor={(item: any) => item._id}
style={{ backgroundColor: colors.backgroundColor }} style={{ backgroundColor: colors.backgroundColor }}
contentContainerStyle={styles.contentContainer} contentContainerStyle={styles.contentContainer}
onEndReachedThreshold={0.5} onEndReachedThreshold={0.5}
removeClippedSubviews={isIOS} removeClippedSubviews={isIOS}
onEndReached={() => (isSearching ? searchTotal : total) > API_FETCH_COUNT ?? load()} onEndReached={() => isSearching && offset.current < total.current && load()}
ItemSeparatorComponent={List.Separator} ItemSeparatorComponent={List.Separator}
ListFooterComponent={loading ? <ActivityIndicator /> : null} ListFooterComponent={loading ? <ActivityIndicator /> : null}
scrollIndicatorInsets={{ right: 1 }} scrollIndicatorInsets={{ right: 1 }}