@planningcenter/chat-react-native 4.3.0-rc.12 → 4.3.0-rc.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/hooks/use_debounced_search_term.d.ts +2 -0
- package/build/hooks/use_debounced_search_term.d.ts.map +1 -0
- package/build/hooks/use_debounced_search_term.js +40 -0
- package/build/hooks/use_debounced_search_term.js.map +1 -0
- package/build/hooks/use_search_results.d.ts.map +1 -1
- package/build/hooks/use_search_results.js +67 -59
- package/build/hooks/use_search_results.js.map +1 -1
- package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.d.ts.map +1 -1
- package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js +142 -158
- package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js.map +1 -1
- package/build/screens/search/components/results_section.d.ts +1 -1
- package/build/screens/search/components/results_section.d.ts.map +1 -1
- package/build/screens/search/components/results_section.js.map +1 -1
- package/build/screens/search/components/search_results_list.d.ts +8 -0
- package/build/screens/search/components/search_results_list.d.ts.map +1 -0
- package/build/screens/search/components/search_results_list.js +314 -0
- package/build/screens/search/components/search_results_list.js.map +1 -0
- package/build/screens/search/search_screen.d.ts.map +1 -1
- package/build/screens/search/search_screen.js +18 -9
- package/build/screens/search/search_screen.js.map +1 -1
- package/package.json +2 -2
- package/src/hooks/__tests__/use_debounced_search_term.test.tsx +38 -0
- package/src/hooks/__tests__/use_search_results.test.tsx +14 -2
- package/src/hooks/use_debounced_search_term.ts +20 -0
- package/src/hooks/use_search_results.ts +4 -3
- package/src/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.tsx +3 -8
- package/src/screens/search/__tests__/search_screen.test.tsx +64 -0
- package/src/screens/search/components/__tests__/search_results_list.test.tsx +135 -0
- package/src/screens/search/components/results_section.tsx +1 -1
- package/src/screens/search/components/search_results_list.tsx +147 -0
- package/src/screens/search/search_screen.tsx +9 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search_results_list.js","names":["React","FlatList","StyleSheet","View","Banner","Spinner","Text","TextButton","useSearchResults","ConversationResults","MessageResultRow","ResultsSection","NoResultsBlankState","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","SEARCH_ERROR_MESSAGE","SearchResultsList","t0","$","_c","term","onSelect","results","failedTypes","isPending","isError","isFetchNextPageError","loadMore","hasNextPage","isFetchingNextPage","t1","filter","isConversationResult","conversationResults","t2","isMessageResult","messageResults","t3","t4","item","item_0","length","t5","includes","SectionFailure","type","t6","title","t7","children","t8","t9","ListEmpty","noResults","t10","accessibilityLabel","style","styles","loading","t11","retry","t12","t13","t14","t15","keyExtractor","_temp","keyboardShouldPersistTaps","keyboardDismissMode","contentContainerStyle","content","renderItem","ListHeaderComponent","ListEmptyComponent","ListFooterComponent","onEndReached","onEndReachedThreshold","id","Symbol","for","appearance","banner","accessibilityRole","variant","sectionFailure","result","create","flexGrow","margin","alignItems","paddingVertical","alignSelf","fontSize","paddingHorizontal"],"sources":["../../../../src/screens/search/components/search_results_list.tsx"],"sourcesContent":["import React from 'react'\nimport { FlatList, StyleSheet, View } from 'react-native'\nimport { Banner, Spinner, Text, TextButton } from '../../../components'\nimport { useSearchResults } from '../../../hooks/use_search_results'\nimport type {\n ConversationSearchResultResource,\n MessageSearchResultResource,\n SearchResultResource,\n} from '../../../types/resources/search_result'\nimport { ConversationResults } from './conversation_results'\nimport { MessageResultRow } from './message_result_row'\nimport { ResultsSection } from './results_section'\nimport { NoResultsBlankState } from './search_blank_states'\n\nconst SEARCH_ERROR_MESSAGE = \"Couldn't search right now. Try again.\"\n\ninterface SearchResultsListProps {\n term: string\n onSelect: (result: SearchResultResource) => void\n}\n\nexport function SearchResultsList({ term, onSelect }: SearchResultsListProps) {\n const {\n results,\n failedTypes,\n isPending,\n isError,\n isFetchNextPageError,\n loadMore,\n hasNextPage,\n isFetchingNextPage,\n } = useSearchResults(term)\n const conversationResults = results.filter(isConversationResult)\n const messageResults = results.filter(isMessageResult)\n\n return (\n <FlatList\n data={messageResults}\n keyExtractor={item => item.id}\n keyboardShouldPersistTaps=\"handled\"\n keyboardDismissMode=\"on-drag\"\n contentContainerStyle={styles.content}\n renderItem={({ item }) => <MessageResultRow result={item} onPress={onSelect} />}\n ListHeaderComponent={\n <>\n {conversationResults.length > 0 && (\n <ConversationResults results={conversationResults} onSelect={onSelect} />\n )}\n {failedTypes.includes('conversation') && <SectionFailure type=\"conversation\" />}\n {messageResults.length > 0 && <ResultsSection title=\"Messages\" />}\n </>\n }\n ListEmptyComponent={\n <ListEmpty\n term={term}\n isError={isError}\n isPending={isPending}\n noResults={results.length === 0 && failedTypes.length === 0}\n />\n }\n ListFooterComponent={\n <>\n {isFetchingNextPage && (\n <View accessibilityLabel=\"Loading more results\" style={styles.loading}>\n <Spinner />\n </View>\n )}\n {isFetchNextPageError && !isFetchingNextPage && (\n <TextButton onPress={loadMore} style={styles.retry}>\n Try again\n </TextButton>\n )}\n {failedTypes.includes('message') && <SectionFailure type=\"message\" />}\n </>\n }\n onEndReached={() => {\n if (hasNextPage && !isFetchingNextPage && !isFetchNextPageError) loadMore()\n }}\n onEndReachedThreshold={0.5}\n />\n )\n}\n\ninterface ListEmptyProps {\n term: string\n isError: boolean\n isPending: boolean\n noResults: boolean\n}\n\nfunction ListEmpty({ term, isError, isPending, noResults }: ListEmptyProps) {\n if (isError) {\n return <Banner appearance=\"error\" description={SEARCH_ERROR_MESSAGE} style={styles.banner} />\n }\n\n if (isPending) {\n return (\n <View accessibilityLabel=\"Loading results\" style={styles.loading}>\n <Spinner />\n </View>\n )\n }\n\n if (noResults) return <NoResultsBlankState term={term} />\n\n return null\n}\n\nfunction SectionFailure({ type }: { type: SearchResultResource['type'] }) {\n return (\n <Text accessibilityRole=\"alert\" variant=\"secondary\" style={styles.sectionFailure}>\n Couldn’t load {type}s.\n </Text>\n )\n}\n\nfunction isConversationResult(\n result: SearchResultResource\n): result is ConversationSearchResultResource {\n return result.type === 'conversation'\n}\n\nfunction isMessageResult(result: SearchResultResource): result is MessageSearchResultResource {\n return result.type === 'message'\n}\n\nconst styles = StyleSheet.create({\n content: {\n flexGrow: 1,\n },\n banner: {\n margin: 16,\n },\n loading: {\n alignItems: 'center',\n paddingVertical: 16,\n },\n retry: {\n alignSelf: 'center',\n paddingVertical: 16,\n },\n sectionFailure: {\n fontSize: 14,\n paddingHorizontal: 16,\n paddingVertical: 8,\n },\n})\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_screen.d.ts","sourceRoot":"","sources":["../../../src/screens/search/search_screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"search_screen.d.ts","sourceRoot":"","sources":["../../../src/screens/search/search_screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,gCAAgC,CAAA;AAcvC,eAAO,MAAM,mBAAmB,GAAI,iBAEjC,sBAAsB,CAAC,aAAa,CAAC,KAAG,4BAIxC,CAAA;AAEH,wBAAgB,YAAY,4CAgB3B"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { c as _c } from "react/compiler-runtime";
|
|
2
|
+
import { noop } from 'lodash';
|
|
2
3
|
import React, { useState } from 'react';
|
|
3
4
|
import { StyleSheet, View } from 'react-native';
|
|
4
5
|
import { KeyboardView } from '../../components';
|
|
5
6
|
import { composeOptions, withMinimalBack } from '../../components/display/platform_modal_header_buttons';
|
|
7
|
+
import { useDebouncedSearchTerm } from '../../hooks/use_debounced_search_term';
|
|
6
8
|
import { SearchPromptBlankState } from './components/search_blank_states';
|
|
7
9
|
import { SearchField } from './components/search_field';
|
|
10
|
+
import { SearchResultsList } from './components/search_results_list';
|
|
8
11
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
9
12
|
export const SearchScreenOptions = ({
|
|
10
13
|
navigation
|
|
@@ -15,8 +18,9 @@ export const SearchScreenOptions = ({
|
|
|
15
18
|
onPress: () => navigation.goBack()
|
|
16
19
|
}));
|
|
17
20
|
export function SearchScreen() {
|
|
18
|
-
const $ = _c(
|
|
21
|
+
const $ = _c(7);
|
|
19
22
|
const [term, setTerm] = useState("");
|
|
23
|
+
const debouncedTerm = useDebouncedSearchTerm(term);
|
|
20
24
|
let t0;
|
|
21
25
|
if ($[0] !== term) {
|
|
22
26
|
t0 = /*#__PURE__*/_jsx(SearchField, {
|
|
@@ -29,14 +33,18 @@ export function SearchScreen() {
|
|
|
29
33
|
t0 = $[1];
|
|
30
34
|
}
|
|
31
35
|
let t1;
|
|
32
|
-
if ($[2]
|
|
33
|
-
t1 = /*#__PURE__*/_jsx(
|
|
34
|
-
|
|
36
|
+
if ($[2] !== debouncedTerm) {
|
|
37
|
+
t1 = debouncedTerm.length > 0 ? /*#__PURE__*/_jsx(SearchResultsList, {
|
|
38
|
+
term: debouncedTerm,
|
|
39
|
+
onSelect: noop
|
|
40
|
+
}, debouncedTerm) : /*#__PURE__*/_jsx(SearchPromptBlankState, {});
|
|
41
|
+
$[2] = debouncedTerm;
|
|
42
|
+
$[3] = t1;
|
|
35
43
|
} else {
|
|
36
|
-
t1 = $[
|
|
44
|
+
t1 = $[3];
|
|
37
45
|
}
|
|
38
46
|
let t2;
|
|
39
|
-
if ($[
|
|
47
|
+
if ($[4] !== t0 || $[5] !== t1) {
|
|
40
48
|
t2 = /*#__PURE__*/_jsx(KeyboardView, {
|
|
41
49
|
children: /*#__PURE__*/_jsxs(View, {
|
|
42
50
|
style: styles.container,
|
|
@@ -44,10 +52,11 @@ export function SearchScreen() {
|
|
|
44
52
|
children: [t0, t1]
|
|
45
53
|
})
|
|
46
54
|
});
|
|
47
|
-
$[
|
|
48
|
-
$[
|
|
55
|
+
$[4] = t0;
|
|
56
|
+
$[5] = t1;
|
|
57
|
+
$[6] = t2;
|
|
49
58
|
} else {
|
|
50
|
-
t2 = $[
|
|
59
|
+
t2 = $[6];
|
|
51
60
|
}
|
|
52
61
|
return t2;
|
|
53
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search_screen.js","names":["React","useState","StyleSheet","View","KeyboardView","composeOptions","withMinimalBack","SearchPromptBlankState","SearchField","jsx","_jsx","jsxs","_jsxs","SearchScreenOptions","navigation","title","animation","onPress","goBack","SearchScreen","$","_c","term","setTerm","
|
|
1
|
+
{"version":3,"file":"search_screen.js","names":["noop","React","useState","StyleSheet","View","KeyboardView","composeOptions","withMinimalBack","useDebouncedSearchTerm","SearchPromptBlankState","SearchField","SearchResultsList","jsx","_jsx","jsxs","_jsxs","SearchScreenOptions","navigation","title","animation","onPress","goBack","SearchScreen","$","_c","term","setTerm","debouncedTerm","t0","t1","length","t2","children","style","styles","container","testID","create","flex"],"sources":["../../../src/screens/search/search_screen.tsx"],"sourcesContent":["import { ParamListBase } from '@react-navigation/native'\nimport {\n NativeStackNavigationOptions,\n NativeStackScreenProps,\n} from '@react-navigation/native-stack'\nimport { noop } from 'lodash'\nimport React, { useState } from 'react'\nimport { StyleSheet, View } from 'react-native'\nimport { KeyboardView } from '../../components'\nimport {\n composeOptions,\n withMinimalBack,\n} from '../../components/display/platform_modal_header_buttons'\nimport { useDebouncedSearchTerm } from '../../hooks/use_debounced_search_term'\nimport { SearchPromptBlankState } from './components/search_blank_states'\nimport { SearchField } from './components/search_field'\nimport { SearchResultsList } from './components/search_results_list'\n\nexport const SearchScreenOptions = ({\n navigation,\n}: NativeStackScreenProps<ParamListBase>): NativeStackNavigationOptions =>\n composeOptions(\n { title: 'Search', animation: 'fade' },\n withMinimalBack({ onPress: () => navigation.goBack() })\n )\n\nexport function SearchScreen() {\n const [term, setTerm] = useState('')\n const debouncedTerm = useDebouncedSearchTerm(term)\n\n return (\n <KeyboardView>\n <View style={styles.container} testID=\"search-screen\">\n <SearchField term={term} onChange={setTerm} />\n {debouncedTerm.length > 0 ? (\n <SearchResultsList key={debouncedTerm} term={debouncedTerm} onSelect={noop} />\n ) : (\n <SearchPromptBlankState />\n )}\n </View>\n </KeyboardView>\n )\n}\n\nconst styles = StyleSheet.create({\n container: {\n flex: 1,\n },\n})\n"],"mappings":";AAKA,SAASA,IAAI,QAAQ,QAAQ;AAC7B,OAAOC,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,YAAY,QAAQ,kBAAkB;AAC/C,SACEC,cAAc,EACdC,eAAe,QACV,wDAAwD;AAC/D,SAASC,sBAAsB,QAAQ,uCAAuC;AAC9E,SAASC,sBAAsB,QAAQ,kCAAkC;AACzE,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,iBAAiB,QAAQ,kCAAkC;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEpE,OAAO,MAAMC,mBAAmB,GAAGA,CAAC;EAClCC;AACqC,CAAC,KACtCX,cAAc,CACZ;EAAEY,KAAK,EAAE,QAAQ;EAAEC,SAAS,EAAE;AAAO,CAAC,EACtCZ,eAAe,CAAC;EAAEa,OAAO,EAAEA,CAAA,KAAMH,UAAU,CAACI,MAAM,CAAC;AAAE,CAAC,CACxD,CAAC;AAEH,OAAO,SAAAC,aAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EACL,OAAAC,IAAA,EAAAC,OAAA,IAAwBxB,QAAQ,CAAC,EAAE,CAAC;EACpC,MAAAyB,aAAA,GAAsBnB,sBAAsB,CAACiB,IAAI,CAAC;EAAA,IAAAG,EAAA;EAAA,IAAAL,CAAA,QAAAE,IAAA;IAK5CG,EAAA,gBAAAf,IAAA,CAACH,WAAW;MAAOe,IAAI,EAAJA,IAAI;MAAYC,QAAO,EAAPA;IAAO,CAAG,CAAC;IAAAH,CAAA,MAAAE,IAAA;IAAAF,CAAA,MAAAK,EAAA;EAAA;IAAAA,EAAA,GAAAL,CAAA;EAAA;EAAA,IAAAM,EAAA;EAAA,IAAAN,CAAA,QAAAI,aAAA;IAC7CE,EAAA,GAAAF,aAAa,CAAAG,MAAO,GAAG,CAIvB,gBAJAjB,IAAA,CACEF,iBAAiB;MAA2BgB,IAAa,EAAbA,aAAa;MAAY3B,QAAI,EAAJA;IAAI,GAAlD2B,aAG1B,CAAC,gBAJAd,IAAA,CAGEJ,sBAAsB,IACzB,CAAC;IAAAc,CAAA,MAAAI,aAAA;IAAAJ,CAAA,MAAAM,EAAA;EAAA;IAAAA,EAAA,GAAAN,CAAA;EAAA;EAAA,IAAAQ,EAAA;EAAA,IAAAR,CAAA,QAAAK,EAAA,IAAAL,CAAA,QAAAM,EAAA;IAPLE,EAAA,gBAAAlB,IAAA,CAACR,YAAY;MAAA2B,QAAA,eACXjB,KAAA,CAACX,IAAI;QAAQ6B,KAAgB,EAAhBC,MAAM,CAAAC,SAAU;QAASC,MAAe,EAAf,eAAe;QAAAJ,QAAA,GACnDJ,EAA8C,EAC7CC,EAIA;MAAA,CACG;IAAC,CACK,CAAC;IAAAN,CAAA,MAAAK,EAAA;IAAAL,CAAA,MAAAM,EAAA;IAAAN,CAAA,MAAAQ,EAAA;EAAA;IAAAA,EAAA,GAAAR,CAAA;EAAA;EAAA,OATfQ,EASe;AAAA;AAInB,MAAMG,MAAM,GAAG/B,UAAU,CAACkC,MAAM,CAAC;EAC/BF,SAAS,EAAE;IACTG,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@planningcenter/chat-react-native",
|
|
3
|
-
"version": "4.3.0-rc.
|
|
3
|
+
"version": "4.3.0-rc.13",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"sf-symbols-typescript": "^2.2.0",
|
|
85
85
|
"typescript": "~6.0.3"
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "a16fd378a12eddb33513b10b59e5d4886e5da587"
|
|
88
88
|
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { act, renderHook } from '@testing-library/react-native'
|
|
2
|
+
import { useDebouncedSearchTerm } from '../use_debounced_search_term'
|
|
3
|
+
|
|
4
|
+
beforeEach(() => jest.useFakeTimers())
|
|
5
|
+
afterEach(() => jest.useRealTimers())
|
|
6
|
+
|
|
7
|
+
describe('useDebouncedSearchTerm', () => {
|
|
8
|
+
it('settles on the trimmed term once typing pauses', () => {
|
|
9
|
+
const { result, rerender } = renderHook(
|
|
10
|
+
({ term }: { term: string }) => useDebouncedSearchTerm(term),
|
|
11
|
+
{
|
|
12
|
+
initialProps: { term: 'bud' },
|
|
13
|
+
}
|
|
14
|
+
)
|
|
15
|
+
|
|
16
|
+
rerender({ term: ' budget ' })
|
|
17
|
+
act(() => jest.advanceTimersByTime(199))
|
|
18
|
+
expect(result.current).toBe('')
|
|
19
|
+
|
|
20
|
+
act(() => jest.advanceTimersByTime(1))
|
|
21
|
+
expect(result.current).toBe('budget')
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
it('clears immediately when the term empties', () => {
|
|
25
|
+
const { result, rerender } = renderHook(
|
|
26
|
+
({ term }: { term: string }) => useDebouncedSearchTerm(term),
|
|
27
|
+
{
|
|
28
|
+
initialProps: { term: 'budget' },
|
|
29
|
+
}
|
|
30
|
+
)
|
|
31
|
+
act(() => jest.advanceTimersByTime(200))
|
|
32
|
+
expect(result.current).toBe('budget')
|
|
33
|
+
|
|
34
|
+
rerender({ term: ' ' })
|
|
35
|
+
|
|
36
|
+
expect(result.current).toBe('')
|
|
37
|
+
})
|
|
38
|
+
})
|
|
@@ -66,11 +66,23 @@ describe('useSearchResults', () => {
|
|
|
66
66
|
expect(hook.current.failedTypes).toEqual(['message'])
|
|
67
67
|
})
|
|
68
68
|
|
|
69
|
-
it('makes no request for an empty term', () => {
|
|
70
|
-
const { result: hook } = renderHook(() => useSearchResults(''), { wrapper })
|
|
69
|
+
it('makes no request for an empty or whitespace-only term', () => {
|
|
70
|
+
const { result: hook } = renderHook(() => useSearchResults(' '), { wrapper })
|
|
71
71
|
|
|
72
72
|
expect(mockGet).not.toHaveBeenCalled()
|
|
73
73
|
expect(hook.current.results).toEqual([])
|
|
74
74
|
expect(hook.current.failedTypes).toBe(NO_FAILED_TYPES)
|
|
75
75
|
})
|
|
76
|
+
|
|
77
|
+
it('searches with the trimmed term', async () => {
|
|
78
|
+
mockGet.mockResolvedValueOnce(page([]))
|
|
79
|
+
|
|
80
|
+
const { result: hook } = renderHook(() => useSearchResults(' potluck '), { wrapper })
|
|
81
|
+
await waitFor(() => expect(hook.current.isPending).toBe(false))
|
|
82
|
+
|
|
83
|
+
expect(mockGet).toHaveBeenCalledWith({
|
|
84
|
+
url: '/search_results',
|
|
85
|
+
data: expect.objectContaining({ q: 'potluck' }),
|
|
86
|
+
})
|
|
87
|
+
})
|
|
76
88
|
})
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { useEffect, useState } from 'react'
|
|
2
|
+
|
|
3
|
+
const DEFAULT_DELAY_MS = 200
|
|
4
|
+
|
|
5
|
+
export function useDebouncedSearchTerm(term: string, delayMs = DEFAULT_DELAY_MS) {
|
|
6
|
+
const [debouncedTerm, setDebouncedTerm] = useState('')
|
|
7
|
+
const trimmedTerm = term.trim()
|
|
8
|
+
|
|
9
|
+
useEffect(() => {
|
|
10
|
+
if (trimmedTerm.length === 0) {
|
|
11
|
+
setDebouncedTerm('')
|
|
12
|
+
return
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const timer = setTimeout(() => setDebouncedTerm(trimmedTerm), delayMs)
|
|
16
|
+
return () => clearTimeout(timer)
|
|
17
|
+
}, [trimmedTerm, delayMs])
|
|
18
|
+
|
|
19
|
+
return debouncedTerm
|
|
20
|
+
}
|
|
@@ -19,6 +19,7 @@ export const NO_FAILED_TYPES: SearchResultResource['type'][] = []
|
|
|
19
19
|
|
|
20
20
|
export function useSearchResults(term: string) {
|
|
21
21
|
const apiClient = useApiClient()
|
|
22
|
+
const trimmedTerm = term.trim()
|
|
22
23
|
|
|
23
24
|
const {
|
|
24
25
|
data,
|
|
@@ -29,9 +30,9 @@ export function useSearchResults(term: string) {
|
|
|
29
30
|
hasNextPage,
|
|
30
31
|
isFetchingNextPage,
|
|
31
32
|
} = useInfiniteQuery({
|
|
32
|
-
queryKey: getSearchResultsQueryKey(
|
|
33
|
+
queryKey: getSearchResultsQueryKey(trimmedTerm),
|
|
33
34
|
queryFn: ({ pageParam }) => {
|
|
34
|
-
const requestArgs = getSearchResultsRequestArgs(
|
|
35
|
+
const requestArgs = getSearchResultsRequestArgs(trimmedTerm)
|
|
35
36
|
return apiClient.chat.get<SearchResultsCollection>({
|
|
36
37
|
url: requestArgs.url,
|
|
37
38
|
data: { ...requestArgs.data, ...pageParam },
|
|
@@ -39,7 +40,7 @@ export function useSearchResults(term: string) {
|
|
|
39
40
|
},
|
|
40
41
|
initialPageParam: {} as SearchResultsPageParam,
|
|
41
42
|
getNextPageParam: lastPage => nextPageParam(lastPage.meta.next?.offset),
|
|
42
|
-
enabled:
|
|
43
|
+
enabled: trimmedTerm.length >= 1,
|
|
43
44
|
staleTime: ONE_MINUTE,
|
|
44
45
|
refetchOnWindowFocus: false,
|
|
45
46
|
refetchOnMount: false,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PlatformPressable } from '@react-navigation/elements'
|
|
2
2
|
import { StackActions, useNavigation } from '@react-navigation/native'
|
|
3
|
-
import { RefObject,
|
|
3
|
+
import { RefObject, useRef, useState } from 'react'
|
|
4
4
|
import { FlatList, Pressable, StyleSheet, TextInput, View } from 'react-native'
|
|
5
5
|
import { Avatar, Badge, Banner, Icon, KeyboardView, Spinner, Text } from '../../components'
|
|
6
6
|
import { ActionButton } from '../../components/display/action_button'
|
|
@@ -11,6 +11,7 @@ import { useDirectMessageAffiliations } from '../../hooks/direct_messages/use_di
|
|
|
11
11
|
import { useDirectMessageCandidates } from '../../hooks/direct_messages/use_direct_message_candidates'
|
|
12
12
|
import { useDirectMessageConversationValidate } from '../../hooks/direct_messages/use_direct_message_conversation_validate'
|
|
13
13
|
import { useFindOrCreateDirectMessageConversation } from '../../hooks/direct_messages/use_find_or_create_direct_message_conversation'
|
|
14
|
+
import { useDebouncedSearchTerm } from '../../hooks/use_debounced_search_term'
|
|
14
15
|
import { availableFeatures, useFeatures } from '../../hooks/use_features'
|
|
15
16
|
import { DirectMessageCandidateResource } from '../../types/resources/direct_message_candidate'
|
|
16
17
|
import { ResultsHeading } from './components/results_heading'
|
|
@@ -26,7 +27,7 @@ export function ConversationSelectDirectMessageRecipientsScreen({
|
|
|
26
27
|
const navigation = useNavigation()
|
|
27
28
|
const { featureEnabled } = useFeatures()
|
|
28
29
|
const [searchTerm, setSearchTerm] = useState('')
|
|
29
|
-
const
|
|
30
|
+
const debouncedTerm = useDebouncedSearchTerm(searchTerm)
|
|
30
31
|
const [selectedPeople, setSelectedPeople] = useState<Map<string, DirectMessageCandidateResource>>(
|
|
31
32
|
() =>
|
|
32
33
|
new Map(
|
|
@@ -45,16 +46,10 @@ export function ConversationSelectDirectMessageRecipientsScreen({
|
|
|
45
46
|
)
|
|
46
47
|
const searchInputRef = useRef<TextInput>(null)
|
|
47
48
|
|
|
48
|
-
useEffect(() => {
|
|
49
|
-
const timer = setTimeout(() => setDebouncedTerm(searchTerm), 200)
|
|
50
|
-
return () => clearTimeout(timer)
|
|
51
|
-
}, [searchTerm])
|
|
52
|
-
|
|
53
49
|
const selectPerson = (person: DirectMessageCandidateResource) => {
|
|
54
50
|
if (selectedPeople.size >= MAX_RECIPIENTS) return
|
|
55
51
|
setSelectedPeople(prev => new Map(prev).set(person.id, person))
|
|
56
52
|
setSearchTerm('')
|
|
57
|
-
setDebouncedTerm('')
|
|
58
53
|
// Controlled TextInput can retain stale native text on iOS when the value
|
|
59
54
|
// is cleared while it stays focused (keyboardShouldPersistTaps keeps it
|
|
60
55
|
// focused through the tap) — clear() forces the native view to sync. Gated
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { act, fireEvent, render } from '@testing-library/react-native'
|
|
2
|
+
import React from 'react'
|
|
3
|
+
import type { useSearchResults } from '../../../hooks/use_search_results'
|
|
4
|
+
import { SearchScreen } from '../search_screen'
|
|
5
|
+
|
|
6
|
+
const mockUseSearchResults = jest.fn<ReturnType<typeof useSearchResults>, [string]>()
|
|
7
|
+
jest.mock('../../../hooks/use_search_results', () => ({
|
|
8
|
+
useSearchResults: (term: string) => mockUseSearchResults(term),
|
|
9
|
+
}))
|
|
10
|
+
jest.mock('../../../components/display/keyboard_view', () => ({
|
|
11
|
+
...jest.requireActual('../../../components/display/keyboard_view'),
|
|
12
|
+
KeyboardView: ({ children }: { children: React.ReactNode }) => children,
|
|
13
|
+
}))
|
|
14
|
+
|
|
15
|
+
const inputLabel = 'Search titles and messages'
|
|
16
|
+
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
jest.useFakeTimers()
|
|
19
|
+
mockUseSearchResults.mockReset().mockReturnValue({
|
|
20
|
+
results: [],
|
|
21
|
+
failedTypes: [],
|
|
22
|
+
isPending: true,
|
|
23
|
+
isError: false,
|
|
24
|
+
isFetchNextPageError: false,
|
|
25
|
+
loadMore: jest.fn(),
|
|
26
|
+
hasNextPage: false,
|
|
27
|
+
isFetchingNextPage: false,
|
|
28
|
+
})
|
|
29
|
+
})
|
|
30
|
+
|
|
31
|
+
afterEach(() => jest.useRealTimers())
|
|
32
|
+
|
|
33
|
+
describe('SearchScreen', () => {
|
|
34
|
+
it('searches once with the trimmed term after typing settles', () => {
|
|
35
|
+
const view = render(<SearchScreen />)
|
|
36
|
+
const input = view.getByLabelText(inputLabel)
|
|
37
|
+
|
|
38
|
+
fireEvent.changeText(input, 'bud')
|
|
39
|
+
fireEvent.changeText(input, ' budget ')
|
|
40
|
+
|
|
41
|
+
expect(view.getByText('Search chat')).toBeTruthy()
|
|
42
|
+
expect(mockUseSearchResults).not.toHaveBeenCalled()
|
|
43
|
+
|
|
44
|
+
act(() => jest.advanceTimersByTime(200))
|
|
45
|
+
|
|
46
|
+
const searchedTerms = new Set(mockUseSearchResults.mock.calls.map(([term]) => term))
|
|
47
|
+
expect([...searchedTerms]).toEqual(['budget'])
|
|
48
|
+
expect(view.queryByText('Search chat')).toBeNull()
|
|
49
|
+
expect(view.getByLabelText('Loading results')).toBeTruthy()
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
it('returns to the prompt as soon as the term is cleared', () => {
|
|
53
|
+
const view = render(<SearchScreen />)
|
|
54
|
+
const input = view.getByLabelText(inputLabel)
|
|
55
|
+
|
|
56
|
+
fireEvent.changeText(input, 'budget')
|
|
57
|
+
act(() => jest.advanceTimersByTime(200))
|
|
58
|
+
expect(view.queryByText('Search chat')).toBeNull()
|
|
59
|
+
|
|
60
|
+
fireEvent.changeText(input, ' ')
|
|
61
|
+
|
|
62
|
+
expect(view.getByText('Search chat')).toBeTruthy()
|
|
63
|
+
})
|
|
64
|
+
})
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { fireEvent, render } from '@testing-library/react-native'
|
|
2
|
+
import React from 'react'
|
|
3
|
+
import { FlatList } from 'react-native'
|
|
4
|
+
import type { useSearchResults } from '../../../../hooks/use_search_results'
|
|
5
|
+
import type {
|
|
6
|
+
ConversationSearchResultResource,
|
|
7
|
+
MessageSearchResultResource,
|
|
8
|
+
} from '../../../../types/resources/search_result'
|
|
9
|
+
import { SearchResultsList } from '../search_results_list'
|
|
10
|
+
|
|
11
|
+
const mockUseSearchResults = jest.fn<ReturnType<typeof useSearchResults>, [string]>()
|
|
12
|
+
jest.mock('../../../../hooks/use_search_results', () => ({
|
|
13
|
+
useSearchResults: (term: string) => mockUseSearchResults(term),
|
|
14
|
+
}))
|
|
15
|
+
|
|
16
|
+
type SearchState = ReturnType<typeof useSearchResults>
|
|
17
|
+
|
|
18
|
+
const searchState = (overrides: Partial<SearchState> = {}): SearchState => ({
|
|
19
|
+
results: [],
|
|
20
|
+
failedTypes: [],
|
|
21
|
+
isPending: false,
|
|
22
|
+
isError: false,
|
|
23
|
+
isFetchNextPageError: false,
|
|
24
|
+
loadMore: jest.fn(),
|
|
25
|
+
hasNextPage: false,
|
|
26
|
+
isFetchingNextPage: false,
|
|
27
|
+
...overrides,
|
|
28
|
+
})
|
|
29
|
+
|
|
30
|
+
const conversationResult = (id: string): ConversationSearchResultResource => ({
|
|
31
|
+
type: 'conversation',
|
|
32
|
+
id,
|
|
33
|
+
title: `Conversation ${id}`,
|
|
34
|
+
url: `/conversations/${id}`,
|
|
35
|
+
extra: { avatar: { previewAvatarUrls: [] } },
|
|
36
|
+
})
|
|
37
|
+
|
|
38
|
+
const messageResult = (id: string): MessageSearchResultResource => ({
|
|
39
|
+
type: 'message',
|
|
40
|
+
id,
|
|
41
|
+
title: `Message ${id}`,
|
|
42
|
+
url: `/conversations/1/messages/${id}`,
|
|
43
|
+
extra: {
|
|
44
|
+
conversationId: 1,
|
|
45
|
+
authorName: 'Ann',
|
|
46
|
+
snippet: [{ text: 'potluck', match: true }],
|
|
47
|
+
createdAt: '2026-01-01T00:00:00Z',
|
|
48
|
+
avatar: { previewAvatarUrls: [] },
|
|
49
|
+
},
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
const renderList = (state: Partial<SearchState>) => {
|
|
53
|
+
mockUseSearchResults.mockReturnValue(searchState(state))
|
|
54
|
+
return render(<SearchResultsList term="potluck" onSelect={jest.fn()} />)
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
describe('SearchResultsList', () => {
|
|
58
|
+
it('shows a spinner while pending', () => {
|
|
59
|
+
const view = renderList({ isPending: true })
|
|
60
|
+
|
|
61
|
+
expect(view.getByLabelText('Loading results')).toBeTruthy()
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
it('shows an error banner when the search fails', () => {
|
|
65
|
+
const view = renderList({ isError: true })
|
|
66
|
+
|
|
67
|
+
expect(view.getByText("Couldn't search right now. Try again.")).toBeTruthy()
|
|
68
|
+
})
|
|
69
|
+
|
|
70
|
+
it('shows the no-results state with the term when nothing matches', () => {
|
|
71
|
+
const view = renderList({})
|
|
72
|
+
|
|
73
|
+
expect(view.getByText(/Nothing matches “potluck\.”/)).toBeTruthy()
|
|
74
|
+
})
|
|
75
|
+
|
|
76
|
+
it('renders both section headings when both types have results', () => {
|
|
77
|
+
const view = renderList({ results: [conversationResult('1'), messageResult('1')] })
|
|
78
|
+
|
|
79
|
+
expect(view.getByText('Conversations')).toBeTruthy()
|
|
80
|
+
expect(view.getByText('Messages')).toBeTruthy()
|
|
81
|
+
expect(view.getByText('Message 1')).toBeTruthy()
|
|
82
|
+
})
|
|
83
|
+
|
|
84
|
+
it('renders the failure text for a failed type instead of the no-results state', () => {
|
|
85
|
+
const view = renderList({ failedTypes: ['message'] })
|
|
86
|
+
|
|
87
|
+
expect(view.getByText('Couldn’t load messages.')).toBeTruthy()
|
|
88
|
+
expect(view.queryByText('No results')).toBeNull()
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
it('keeps the no-results state hidden when only conversations match', () => {
|
|
92
|
+
const view = renderList({ results: [conversationResult('1')] })
|
|
93
|
+
|
|
94
|
+
expect(view.getByText('Conversations')).toBeTruthy()
|
|
95
|
+
expect(view.queryByText('No results')).toBeNull()
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
it('loads the next page once when the end is reached', () => {
|
|
99
|
+
const loadMore = jest.fn()
|
|
100
|
+
const view = renderList({ results: [messageResult('1')], hasNextPage: true, loadMore })
|
|
101
|
+
|
|
102
|
+
fireEvent(view.UNSAFE_getByType(FlatList), 'onEndReached')
|
|
103
|
+
|
|
104
|
+
expect(loadMore).toHaveBeenCalledTimes(1)
|
|
105
|
+
})
|
|
106
|
+
|
|
107
|
+
it('does not load more while a page is already fetching', () => {
|
|
108
|
+
const loadMore = jest.fn()
|
|
109
|
+
const view = renderList({
|
|
110
|
+
results: [messageResult('1')],
|
|
111
|
+
hasNextPage: true,
|
|
112
|
+
isFetchingNextPage: true,
|
|
113
|
+
loadMore,
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
fireEvent(view.UNSAFE_getByType(FlatList), 'onEndReached')
|
|
117
|
+
|
|
118
|
+
expect(view.getByLabelText('Loading more results')).toBeTruthy()
|
|
119
|
+
expect(loadMore).not.toHaveBeenCalled()
|
|
120
|
+
})
|
|
121
|
+
|
|
122
|
+
it('offers a retry after a paging failure', () => {
|
|
123
|
+
const loadMore = jest.fn()
|
|
124
|
+
const view = renderList({
|
|
125
|
+
results: [messageResult('1')],
|
|
126
|
+
hasNextPage: true,
|
|
127
|
+
isFetchNextPageError: true,
|
|
128
|
+
loadMore,
|
|
129
|
+
})
|
|
130
|
+
|
|
131
|
+
fireEvent.press(view.getByText('Try again'))
|
|
132
|
+
|
|
133
|
+
expect(loadMore).toHaveBeenCalledTimes(1)
|
|
134
|
+
})
|
|
135
|
+
})
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { FlatList, StyleSheet, View } from 'react-native'
|
|
3
|
+
import { Banner, Spinner, Text, TextButton } from '../../../components'
|
|
4
|
+
import { useSearchResults } from '../../../hooks/use_search_results'
|
|
5
|
+
import type {
|
|
6
|
+
ConversationSearchResultResource,
|
|
7
|
+
MessageSearchResultResource,
|
|
8
|
+
SearchResultResource,
|
|
9
|
+
} from '../../../types/resources/search_result'
|
|
10
|
+
import { ConversationResults } from './conversation_results'
|
|
11
|
+
import { MessageResultRow } from './message_result_row'
|
|
12
|
+
import { ResultsSection } from './results_section'
|
|
13
|
+
import { NoResultsBlankState } from './search_blank_states'
|
|
14
|
+
|
|
15
|
+
const SEARCH_ERROR_MESSAGE = "Couldn't search right now. Try again."
|
|
16
|
+
|
|
17
|
+
interface SearchResultsListProps {
|
|
18
|
+
term: string
|
|
19
|
+
onSelect: (result: SearchResultResource) => void
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export function SearchResultsList({ term, onSelect }: SearchResultsListProps) {
|
|
23
|
+
const {
|
|
24
|
+
results,
|
|
25
|
+
failedTypes,
|
|
26
|
+
isPending,
|
|
27
|
+
isError,
|
|
28
|
+
isFetchNextPageError,
|
|
29
|
+
loadMore,
|
|
30
|
+
hasNextPage,
|
|
31
|
+
isFetchingNextPage,
|
|
32
|
+
} = useSearchResults(term)
|
|
33
|
+
const conversationResults = results.filter(isConversationResult)
|
|
34
|
+
const messageResults = results.filter(isMessageResult)
|
|
35
|
+
|
|
36
|
+
return (
|
|
37
|
+
<FlatList
|
|
38
|
+
data={messageResults}
|
|
39
|
+
keyExtractor={item => item.id}
|
|
40
|
+
keyboardShouldPersistTaps="handled"
|
|
41
|
+
keyboardDismissMode="on-drag"
|
|
42
|
+
contentContainerStyle={styles.content}
|
|
43
|
+
renderItem={({ item }) => <MessageResultRow result={item} onPress={onSelect} />}
|
|
44
|
+
ListHeaderComponent={
|
|
45
|
+
<>
|
|
46
|
+
{conversationResults.length > 0 && (
|
|
47
|
+
<ConversationResults results={conversationResults} onSelect={onSelect} />
|
|
48
|
+
)}
|
|
49
|
+
{failedTypes.includes('conversation') && <SectionFailure type="conversation" />}
|
|
50
|
+
{messageResults.length > 0 && <ResultsSection title="Messages" />}
|
|
51
|
+
</>
|
|
52
|
+
}
|
|
53
|
+
ListEmptyComponent={
|
|
54
|
+
<ListEmpty
|
|
55
|
+
term={term}
|
|
56
|
+
isError={isError}
|
|
57
|
+
isPending={isPending}
|
|
58
|
+
noResults={results.length === 0 && failedTypes.length === 0}
|
|
59
|
+
/>
|
|
60
|
+
}
|
|
61
|
+
ListFooterComponent={
|
|
62
|
+
<>
|
|
63
|
+
{isFetchingNextPage && (
|
|
64
|
+
<View accessibilityLabel="Loading more results" style={styles.loading}>
|
|
65
|
+
<Spinner />
|
|
66
|
+
</View>
|
|
67
|
+
)}
|
|
68
|
+
{isFetchNextPageError && !isFetchingNextPage && (
|
|
69
|
+
<TextButton onPress={loadMore} style={styles.retry}>
|
|
70
|
+
Try again
|
|
71
|
+
</TextButton>
|
|
72
|
+
)}
|
|
73
|
+
{failedTypes.includes('message') && <SectionFailure type="message" />}
|
|
74
|
+
</>
|
|
75
|
+
}
|
|
76
|
+
onEndReached={() => {
|
|
77
|
+
if (hasNextPage && !isFetchingNextPage && !isFetchNextPageError) loadMore()
|
|
78
|
+
}}
|
|
79
|
+
onEndReachedThreshold={0.5}
|
|
80
|
+
/>
|
|
81
|
+
)
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
interface ListEmptyProps {
|
|
85
|
+
term: string
|
|
86
|
+
isError: boolean
|
|
87
|
+
isPending: boolean
|
|
88
|
+
noResults: boolean
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
function ListEmpty({ term, isError, isPending, noResults }: ListEmptyProps) {
|
|
92
|
+
if (isError) {
|
|
93
|
+
return <Banner appearance="error" description={SEARCH_ERROR_MESSAGE} style={styles.banner} />
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (isPending) {
|
|
97
|
+
return (
|
|
98
|
+
<View accessibilityLabel="Loading results" style={styles.loading}>
|
|
99
|
+
<Spinner />
|
|
100
|
+
</View>
|
|
101
|
+
)
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
if (noResults) return <NoResultsBlankState term={term} />
|
|
105
|
+
|
|
106
|
+
return null
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
function SectionFailure({ type }: { type: SearchResultResource['type'] }) {
|
|
110
|
+
return (
|
|
111
|
+
<Text accessibilityRole="alert" variant="secondary" style={styles.sectionFailure}>
|
|
112
|
+
Couldn’t load {type}s.
|
|
113
|
+
</Text>
|
|
114
|
+
)
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
function isConversationResult(
|
|
118
|
+
result: SearchResultResource
|
|
119
|
+
): result is ConversationSearchResultResource {
|
|
120
|
+
return result.type === 'conversation'
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
function isMessageResult(result: SearchResultResource): result is MessageSearchResultResource {
|
|
124
|
+
return result.type === 'message'
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
const styles = StyleSheet.create({
|
|
128
|
+
content: {
|
|
129
|
+
flexGrow: 1,
|
|
130
|
+
},
|
|
131
|
+
banner: {
|
|
132
|
+
margin: 16,
|
|
133
|
+
},
|
|
134
|
+
loading: {
|
|
135
|
+
alignItems: 'center',
|
|
136
|
+
paddingVertical: 16,
|
|
137
|
+
},
|
|
138
|
+
retry: {
|
|
139
|
+
alignSelf: 'center',
|
|
140
|
+
paddingVertical: 16,
|
|
141
|
+
},
|
|
142
|
+
sectionFailure: {
|
|
143
|
+
fontSize: 14,
|
|
144
|
+
paddingHorizontal: 16,
|
|
145
|
+
paddingVertical: 8,
|
|
146
|
+
},
|
|
147
|
+
})
|