@planningcenter/chat-react-native 4.3.0-rc.0 → 4.3.0-rc.10

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.
Files changed (144) hide show
  1. package/build/components/conversation/message_form.d.ts +2 -1
  2. package/build/components/conversation/message_form.d.ts.map +1 -1
  3. package/build/components/conversation/message_form.js +167 -370
  4. package/build/components/conversation/message_form.js.map +1 -1
  5. package/build/components/conversation/message_list.d.ts +5 -2
  6. package/build/components/conversation/message_list.d.ts.map +1 -1
  7. package/build/components/conversation/message_list.js +187 -67
  8. package/build/components/conversation/message_list.js.map +1 -1
  9. package/build/components/conversation/missing_message.d.ts +2 -0
  10. package/build/components/conversation/missing_message.d.ts.map +1 -0
  11. package/build/components/conversation/missing_message.js +139 -0
  12. package/build/components/conversation/missing_message.js.map +1 -0
  13. package/build/components/display/conversation_avatar.d.ts +1 -2
  14. package/build/components/display/conversation_avatar.d.ts.map +1 -1
  15. package/build/components/display/conversation_avatar.js.map +1 -1
  16. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +4 -3
  17. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
  18. package/build/hooks/use_conversation_messages.d.ts +14 -5
  19. package/build/hooks/use_conversation_messages.d.ts.map +1 -1
  20. package/build/hooks/use_conversation_messages.js +218 -42
  21. package/build/hooks/use_conversation_messages.js.map +1 -1
  22. package/build/hooks/use_conversation_messages_jolt_events.d.ts.map +1 -1
  23. package/build/hooks/use_conversation_messages_jolt_events.js +58 -42
  24. package/build/hooks/use_conversation_messages_jolt_events.js.map +1 -1
  25. package/build/hooks/use_features.d.ts +2 -1
  26. package/build/hooks/use_features.d.ts.map +1 -1
  27. package/build/hooks/use_features.js +2 -1
  28. package/build/hooks/use_features.js.map +1 -1
  29. package/build/hooks/use_mark_latest_message_read.d.ts +2 -1
  30. package/build/hooks/use_mark_latest_message_read.d.ts.map +1 -1
  31. package/build/hooks/use_mark_latest_message_read.js +4 -3
  32. package/build/hooks/use_mark_latest_message_read.js.map +1 -1
  33. package/build/hooks/use_read_receipts.d.ts +4 -3
  34. package/build/hooks/use_read_receipts.d.ts.map +1 -1
  35. package/build/hooks/use_search_results.d.ts +19 -0
  36. package/build/hooks/use_search_results.d.ts.map +1 -0
  37. package/build/hooks/use_search_results.js +145 -0
  38. package/build/hooks/use_search_results.js.map +1 -0
  39. package/build/hooks/use_suspense_api.d.ts +10 -6
  40. package/build/hooks/use_suspense_api.d.ts.map +1 -1
  41. package/build/hooks/use_suspense_api.js +83 -63
  42. package/build/hooks/use_suspense_api.js.map +1 -1
  43. package/build/navigation/index.d.ts +5 -0
  44. package/build/navigation/index.d.ts.map +1 -1
  45. package/build/navigation/index.js +5 -0
  46. package/build/navigation/index.js.map +1 -1
  47. package/build/screens/conversation_new/components/services_form.js +9 -8
  48. package/build/screens/conversation_new/components/services_form.js.map +1 -1
  49. package/build/screens/conversation_screen.d.ts +1 -0
  50. package/build/screens/conversation_screen.d.ts.map +1 -1
  51. package/build/screens/conversation_screen.js +305 -203
  52. package/build/screens/conversation_screen.js.map +1 -1
  53. package/build/screens/conversations/components/search_list_header_component.d.ts.map +1 -1
  54. package/build/screens/conversations/components/search_list_header_component.js +159 -133
  55. package/build/screens/conversations/components/search_list_header_component.js.map +1 -1
  56. package/build/screens/message_actions_screen.d.ts.map +1 -1
  57. package/build/screens/message_actions_screen.js +103 -92
  58. package/build/screens/message_actions_screen.js.map +1 -1
  59. package/build/screens/notification_settings/hooks/groups.d.ts +4 -3
  60. package/build/screens/notification_settings/hooks/groups.d.ts.map +1 -1
  61. package/build/screens/search/components/search_blank_states.d.ts +7 -0
  62. package/build/screens/search/components/search_blank_states.d.ts.map +1 -0
  63. package/build/screens/search/components/search_blank_states.js +72 -0
  64. package/build/screens/search/components/search_blank_states.js.map +1 -0
  65. package/build/screens/search/components/search_field.d.ts +7 -0
  66. package/build/screens/search/components/search_field.d.ts.map +1 -0
  67. package/build/screens/search/components/search_field.js +152 -0
  68. package/build/screens/search/components/search_field.js.map +1 -0
  69. package/build/screens/search/search_screen.d.ts +5 -0
  70. package/build/screens/search/search_screen.d.ts.map +1 -0
  71. package/build/screens/search/search_screen.js +59 -0
  72. package/build/screens/search/search_screen.js.map +1 -0
  73. package/build/types/api_primitives.d.ts +1 -0
  74. package/build/types/api_primitives.d.ts.map +1 -1
  75. package/build/types/api_primitives.js.map +1 -1
  76. package/build/types/resources/conversation.d.ts +1 -0
  77. package/build/types/resources/conversation.d.ts.map +1 -1
  78. package/build/types/resources/conversation.js.map +1 -1
  79. package/build/types/resources/index.d.ts +1 -0
  80. package/build/types/resources/index.d.ts.map +1 -1
  81. package/build/types/resources/index.js +1 -0
  82. package/build/types/resources/index.js.map +1 -1
  83. package/build/types/resources/search_result.d.ts +29 -0
  84. package/build/types/resources/search_result.d.ts.map +1 -0
  85. package/build/types/resources/search_result.js +2 -0
  86. package/build/types/resources/search_result.js.map +1 -0
  87. package/build/utils/cache/messages_cache.d.ts +1 -0
  88. package/build/utils/cache/messages_cache.d.ts.map +1 -1
  89. package/build/utils/cache/messages_cache.js +37 -1
  90. package/build/utils/cache/messages_cache.js.map +1 -1
  91. package/build/utils/cache/messages_window.d.ts +11 -0
  92. package/build/utils/cache/messages_window.d.ts.map +1 -0
  93. package/build/utils/cache/messages_window.js +51 -0
  94. package/build/utils/cache/messages_window.js.map +1 -0
  95. package/build/utils/client/types.d.ts +1 -0
  96. package/build/utils/client/types.d.ts.map +1 -1
  97. package/build/utils/client/types.js.map +1 -1
  98. package/build/utils/request/get_search_results.d.ts +13 -0
  99. package/build/utils/request/get_search_results.d.ts.map +1 -0
  100. package/build/utils/request/get_search_results.js +20 -0
  101. package/build/utils/request/get_search_results.js.map +1 -0
  102. package/package.json +2 -2
  103. package/src/__tests__/hooks/use_features.test.ts +10 -2
  104. package/src/__tests__/screens/conversation_new/components/services_form.test.tsx +91 -0
  105. package/src/__utils__/query_client.ts +3 -0
  106. package/src/components/conversation/message_form.tsx +31 -3
  107. package/src/components/conversation/message_list.tsx +88 -4
  108. package/src/components/conversation/missing_message.tsx +66 -0
  109. package/src/components/display/conversation_avatar.tsx +1 -10
  110. package/src/hooks/__tests__/use_conversation_messages.test.tsx +333 -0
  111. package/src/hooks/__tests__/use_conversation_messages_jolt_events.test.tsx +87 -0
  112. package/src/hooks/__tests__/use_mark_latest_message_read.test.tsx +33 -0
  113. package/src/hooks/__tests__/use_message_create_or_update.test.tsx +2 -7
  114. package/src/hooks/__tests__/use_search_results.test.tsx +76 -0
  115. package/src/hooks/use_conversation_messages.ts +103 -17
  116. package/src/hooks/use_conversation_messages_jolt_events.ts +12 -2
  117. package/src/hooks/use_features.ts +3 -2
  118. package/src/hooks/use_mark_latest_message_read.ts +4 -3
  119. package/src/hooks/use_search_results.ts +77 -0
  120. package/src/hooks/use_suspense_api.ts +14 -6
  121. package/src/navigation/index.tsx +5 -0
  122. package/src/screens/conversation_new/components/services_form.tsx +5 -5
  123. package/src/screens/conversation_screen.tsx +62 -13
  124. package/src/screens/conversations/components/__tests__/search_list_header_component.test.tsx +62 -0
  125. package/src/screens/conversations/components/search_list_header_component.tsx +11 -0
  126. package/src/screens/message_actions_screen.tsx +12 -1
  127. package/src/screens/search/components/__tests__/search_blank_states.test.tsx +20 -0
  128. package/src/screens/search/components/__tests__/search_field.test.tsx +29 -0
  129. package/src/screens/search/components/search_blank_states.tsx +34 -0
  130. package/src/screens/search/components/search_field.tsx +81 -0
  131. package/src/screens/search/search_screen.tsx +41 -0
  132. package/src/types/api_primitives.ts +1 -0
  133. package/src/types/resources/conversation.ts +9 -0
  134. package/src/types/resources/index.ts +1 -0
  135. package/src/types/resources/search_result.ts +32 -0
  136. package/src/utils/__tests__/get_search_results.test.ts +24 -0
  137. package/src/utils/cache/__tests__/messages_cache.test.ts +2 -1
  138. package/src/utils/cache/__tests__/messages_cache_deletion.test.ts +97 -0
  139. package/src/utils/cache/__tests__/messages_cache_reply_roots.test.ts +3 -2
  140. package/src/utils/cache/__tests__/messages_window.test.ts +78 -0
  141. package/src/utils/cache/messages_cache.ts +45 -1
  142. package/src/utils/cache/messages_window.ts +55 -0
  143. package/src/utils/client/types.ts +1 -0
  144. package/src/utils/request/get_search_results.ts +23 -0
@@ -28,7 +28,10 @@ import { ConversationContextProvider } from '../contexts/conversation_context'
28
28
  import { useMessageAvailableMembersAction } from '../hooks/direct_messages/use_message_available_members_action'
29
29
  import { useConversation } from '../hooks/use_conversation'
30
30
  import { useConversationJoltEvents } from '../hooks/use_conversation_jolt_events'
31
- import { useConversationMessages } from '../hooks/use_conversation_messages'
31
+ import {
32
+ dropMessagesWindowIfBehind,
33
+ useConversationMessages,
34
+ } from '../hooks/use_conversation_messages'
32
35
  import { useConversationMessagesJoltEvents } from '../hooks/use_conversation_messages_jolt_events'
33
36
  import { useMarkLatestMessageRead } from '../hooks/use_mark_latest_message_read'
34
37
  import {
@@ -41,10 +44,12 @@ import { useVideoModerationJoltEvents } from '../hooks/use_video_moderation_jolt
41
44
  import { ConversationResource } from '../types/resources/conversation'
42
45
  import { ConversationBadgeResource } from '../types/resources/conversation_badge'
43
46
  import { MessageResource } from '../types/resources/message'
47
+ import { Log } from '../utils'
44
48
 
45
49
  export type ConversationRouteProps = {
46
50
  conversation_id: number
47
51
  reply_root_id?: string | null
52
+ initial_message_id?: string | null
48
53
  reply_root_author_name?: string
49
54
  chat_group_graph_id?: string
50
55
  clear_input?: boolean
@@ -81,18 +86,25 @@ export function ConversationScreen({ route }: ConversationScreenProps) {
81
86
  function ConversationScreenContent({ route }: ConversationScreenProps) {
82
87
  const styles = useStyles()
83
88
  const navigation = useNavigation()
84
- const { conversation_id, editing_message_id, reply_root_id, reply_root_author_name } =
85
- route.params
86
- const { data: conversation } = useConversation(route.params)
87
- const { messages, fetchNextPage, hasNextPage } = useConversationMessages({
89
+ const {
88
90
  conversation_id,
91
+ editing_message_id,
89
92
  reply_root_id,
90
- })
93
+ reply_root_author_name,
94
+ initial_message_id,
95
+ } = route.params
96
+ const { data: conversation } = useConversation(route.params)
97
+ const { messages, behind, fetchNextPage, fetchNewer, fetchLiveWindow, hasNextPage } =
98
+ useConversationMessages({
99
+ conversation_id,
100
+ reply_root_id,
101
+ anchor: initial_message_id,
102
+ })
91
103
  useConversationJoltEvents({ conversationId: conversation_id })
92
104
  useConversationMessagesJoltEvents({ conversationId: conversation_id })
93
105
  const { markHandledByMessageForm } = useVideoModerationJoltEvents()
94
106
  useEnsureConversationsRouteExists()
95
- useMarkLatestMessageRead({ conversation, messages })
107
+ useMarkLatestMessageRead({ conversation, messages, enabled: !behind })
96
108
  const noMessages = messages.length === 0
97
109
 
98
110
  const { repliesDisabled, memberAbility, badges, title } = conversation
@@ -120,11 +132,24 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
120
132
  enabled: Platform.OS === 'ios',
121
133
  })
122
134
 
123
- const handleReturnToBottom = useCallback(() => {
124
- listRef.current?.scrollToOffset({
125
- offset: restOffset,
126
- })
127
- }, [restOffset])
135
+ const [anchorMessageId, setAnchorMessageId] = useState(initial_message_id)
136
+ const releaseAnchor = useCallback(() => setAnchorMessageId(null), [])
137
+
138
+ const handleReturnToBottom = useCallback(
139
+ (animated = true) => {
140
+ releaseAnchor()
141
+ listRef.current?.scrollToOffset({ offset: restOffset, animated })
142
+ },
143
+ [releaseAnchor, restOffset]
144
+ )
145
+
146
+ const logWindowFetchFailure = (error: unknown) =>
147
+ Log.error('conversation window fetch failed', error)
148
+
149
+ const returnToLatest = async () => {
150
+ if (behind) await fetchLiveWindow()
151
+ handleReturnToBottom(false)
152
+ }
128
153
 
129
154
  useEffect(() => {
130
155
  if (reply_root_id) {
@@ -141,6 +166,18 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
141
166
  }
142
167
  }, [navigation, title, badges, conversation?.deleted, reply_root_id, replyHeaderTitle, muted])
143
168
 
169
+ useEffect(() => {
170
+ if (!initial_message_id) return
171
+
172
+ navigation.setParams({ initial_message_id: null })
173
+ }, [initial_message_id, navigation])
174
+
175
+ // A window left behind the live edge would make the next open from the list start
176
+ // mid-history with no pill, so we only keep windows that are live.
177
+ useEffect(() => {
178
+ return () => dropMessagesWindowIfBehind({ conversation_id, reply_root_id })
179
+ }, [conversation_id, reply_root_id])
180
+
144
181
  if (!conversation || conversation.deleted) {
145
182
  return (
146
183
  <View style={styles.container}>
@@ -174,8 +211,11 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
174
211
  conversationId={conversation_id}
175
212
  messages={messages}
176
213
  replyRootId={reply_root_id}
214
+ anchorMessageId={anchorMessageId}
215
+ behind={behind}
177
216
  hasNextPage={hasNextPage}
178
217
  onEndReached={() => fetchNextPage()}
218
+ onStartReached={() => fetchNewer().catch(logWindowFetchFailure)}
179
219
  onScroll={trackScroll}
180
220
  onLayout={onLayout}
181
221
  onContentSizeChange={onContentSizeChange}
@@ -183,7 +223,12 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
183
223
  onMomentumScrollEnd={onMomentumScrollEnd}
184
224
  />
185
225
  )}
186
- <JumpToBottomButton onPress={handleReturnToBottom} visible={showJumpToBottomButton} />
226
+ <JumpToBottomButton
227
+ onPress={() =>
228
+ behind ? returnToLatest().catch(logWindowFetchFailure) : handleReturnToBottom()
229
+ }
230
+ visible={showJumpToBottomButton || behind}
231
+ />
187
232
  {!noMessages && <TypingIndicator />}
188
233
  {showLeaderDisabledReplyBanner && <LeaderMessagesDisabledBanner />}
189
234
  <ConversationBottomBar
@@ -193,6 +238,7 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
193
238
  replyRootId={reply_root_id}
194
239
  currentlyEditingMessage={currentlyEditingMessage}
195
240
  onFlaggedInMessageForm={markHandledByMessageForm}
241
+ onBeforeSubmit={returnToLatest}
196
242
  />
197
243
  </KeyboardView>
198
244
  </View>
@@ -206,6 +252,7 @@ interface ConversationBottomBarProps {
206
252
  replyRootId: string | null | undefined
207
253
  currentlyEditingMessage: MessageResource | undefined
208
254
  onFlaggedInMessageForm?: (id: string) => void
255
+ onBeforeSubmit?: () => void
209
256
  }
210
257
 
211
258
  function ConversationBottomBar({
@@ -215,6 +262,7 @@ function ConversationBottomBar({
215
262
  replyRootId,
216
263
  currentlyEditingMessage,
217
264
  onFlaggedInMessageForm,
265
+ onBeforeSubmit,
218
266
  }: ConversationBottomBarProps) {
219
267
  const messageLink = useMessageAvailableMembersAction(conversation)
220
268
 
@@ -233,6 +281,7 @@ function ConversationBottomBar({
233
281
  replyRootId={replyRootId}
234
282
  currentlyEditingMessage={currentlyEditingMessage}
235
283
  onFlaggedInMessageForm={onFlaggedInMessageForm}
284
+ onBeforeSubmit={onBeforeSubmit}
236
285
  key={
237
286
  currentlyEditingMessage
238
287
  ? `edit-message-form-${currentlyEditingMessage.id}`
@@ -0,0 +1,62 @@
1
+ import { fireEvent, render } from '@testing-library/react-native'
2
+ import React from 'react'
3
+ import { SearchListHeaderComponent } from '../search_list_header_component'
4
+
5
+ const mockNavigate = jest.fn()
6
+
7
+ jest.mock('@react-navigation/native', () => ({
8
+ ...jest.requireActual('@react-navigation/native'),
9
+ useNavigation: () => ({ setParams: jest.fn(), navigate: mockNavigate }),
10
+ useRoute: () => ({ params: {} }),
11
+ }))
12
+
13
+ jest.mock('../../../../hooks/use_groups', () => ({
14
+ useCanDisplayGroups: () => true,
15
+ }))
16
+ jest.mock('../../../../hooks/use_direct_messages_eligible', () => ({
17
+ useDirectMessagesEligible: () => true,
18
+ }))
19
+ jest.mock('../../../../hooks/use_has_direct_messages', () => ({
20
+ useHasDirectMessages: () => true,
21
+ }))
22
+ jest.mock('../../../../hooks/use_chat_permissions', () => ({
23
+ useCanCreateConversations: () => true,
24
+ }))
25
+ jest.mock('../../../../hooks/use_new_conversation_entry', () => ({
26
+ useNewConversationEntry: () => 'select_type',
27
+ }))
28
+ jest.mock('../../../../hooks/use_current_person', () => ({
29
+ useCurrentPersonCache: () => ({ update: jest.fn() }),
30
+ }))
31
+ jest.mock('../../../../hooks/use_conversations_actions', () => ({
32
+ useMarkAllRead: () => ({ markAllRead: jest.fn(), isPending: false }),
33
+ }))
34
+ jest.mock('../../../../hooks/use_new_conversation_from_filter', () => ({
35
+ useNewConversationFromFilter: () => undefined,
36
+ }))
37
+ jest.mock('../../../../hooks/use_api', () => ({
38
+ useApiGet: () => ({ data: undefined }),
39
+ }))
40
+
41
+ describe('SearchListHeaderComponent search button', () => {
42
+ beforeEach(() => mockNavigate.mockClear())
43
+
44
+ it('navigates to Search on press', () => {
45
+ const view = render(<SearchListHeaderComponent />)
46
+
47
+ fireEvent.press(view.getByTestId('conversations-search-button'))
48
+
49
+ expect(mockNavigate).toHaveBeenCalledTimes(1)
50
+ expect(mockNavigate).toHaveBeenCalledWith('Search')
51
+ })
52
+
53
+ it('renders the search button after the other actions', () => {
54
+ const view = render(<SearchListHeaderComponent />)
55
+
56
+ const buttons = view.getAllByRole('button').map(button => button.props.accessibilityLabel)
57
+
58
+ expect(buttons.indexOf('Search')).toBeGreaterThanOrEqual(0)
59
+ expect(buttons.indexOf('Search')).toBeGreaterThan(buttons.indexOf('Chat settings'))
60
+ expect(buttons.indexOf('Search')).toBeGreaterThan(buttons.indexOf('New conversation'))
61
+ })
62
+ })
@@ -110,6 +110,10 @@ export const SearchListHeaderComponent = () => {
110
110
  [navigation]
111
111
  )
112
112
 
113
+ const handleSearch = useCallback(() => {
114
+ navigation.navigate('Search')
115
+ }, [navigation])
116
+
113
117
  const handleChatSettings = useCallback(() => {
114
118
  navigation.navigate('ChatSettings', {})
115
119
  }, [navigation])
@@ -188,6 +192,13 @@ export const SearchListHeaderComponent = () => {
188
192
  maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
189
193
  />
190
194
  )}
195
+ <ListHeaderActionButton
196
+ name="general.search"
197
+ onPress={handleSearch}
198
+ accessibilityLabel="Search"
199
+ testID="conversations-search-button"
200
+ maxFontSizeMultiplier={MAX_FONT_SIZE_MULTIPLIER_LANDMARK}
201
+ />
191
202
  {shouldShowHeaderFiltersButton && <ToggleButton {...moreFiltersButtonProps} />}
192
203
  </View>
193
204
  </View>
@@ -1,6 +1,6 @@
1
1
  import { PlatformPressable } from '@react-navigation/elements'
2
2
  import { StackActions, StaticScreenProps, useNavigation } from '@react-navigation/native'
3
- import { useMutation } from '@tanstack/react-query'
3
+ import { useMutation, useQueryClient } from '@tanstack/react-query'
4
4
  import { isNil, omitBy } from 'lodash'
5
5
  import React, { useCallback } from 'react'
6
6
  import { Alert, Platform, StyleSheet, View } from 'react-native'
@@ -15,6 +15,10 @@ import { useMessageReactionToggle } from '../hooks/use_message_reaction_toggle'
15
15
  import { MessageResource } from '../types'
16
16
  import { ReactionCountResource } from '../types/resources/reaction'
17
17
  import { REACTION_EMOJIS } from '../utils'
18
+ import {
19
+ applyMessageDeletionToCaches,
20
+ getThreadedMessagesQueryKey,
21
+ } from '../utils/cache/messages_cache'
18
22
  import { Clipboard, Haptic } from '../utils/native_adapters'
19
23
 
20
24
  export const MessageActionsScreenOptions = getFormSheetScreenOptions({
@@ -81,6 +85,7 @@ function MessageActionsScreenContent({
81
85
  }) {
82
86
  const navigation = useNavigation()
83
87
  const apiClient = useApiClient()
88
+ const queryClient = useQueryClient()
84
89
  const styles = useStyles()
85
90
  const { featureEnabled } = useFeatures()
86
91
  const expandedLink = message.attachments.find(attachment => attachment.type === 'ExpandedLink')
@@ -147,6 +152,12 @@ function MessageActionsScreenContent({
147
152
  mutationFn: deleteMessage,
148
153
  mutationKey: ['deleteMessage', message.id],
149
154
  onSuccess: () => {
155
+ applyMessageDeletionToCaches(queryClient, conversation_id, message)
156
+ if (message.replyRootId) {
157
+ queryClient.invalidateQueries({
158
+ queryKey: getThreadedMessagesQueryKey(conversation_id, message.replyRootId),
159
+ })
160
+ }
150
161
  refetchMessages()
151
162
  Haptic.notificationSuccess()
152
163
  },
@@ -0,0 +1,20 @@
1
+ import { render } from '@testing-library/react-native'
2
+ import React from 'react'
3
+ import { NoResultsBlankState, SearchPromptBlankState } from '../search_blank_states'
4
+
5
+ describe('SearchPromptBlankState', () => {
6
+ it('renders the prompt heading', () => {
7
+ const view = render(<SearchPromptBlankState />)
8
+
9
+ expect(view.getByText('Search chat')).toBeTruthy()
10
+ })
11
+ })
12
+
13
+ describe('NoResultsBlankState', () => {
14
+ it('renders the heading and the searched term', () => {
15
+ const view = render(<NoResultsBlankState term="budget" />)
16
+
17
+ expect(view.getByText('No results')).toBeTruthy()
18
+ expect(view.getByText(/Nothing matches “budget\.”/)).toBeTruthy()
19
+ })
20
+ })
@@ -0,0 +1,29 @@
1
+ import { fireEvent, render } from '@testing-library/react-native'
2
+ import React from 'react'
3
+ import { SearchField } from '../search_field'
4
+
5
+ const inputLabel = 'Search titles and messages'
6
+ const clearLabel = 'Clear search'
7
+
8
+ describe('SearchField', () => {
9
+ it('reports typed text through onChange', () => {
10
+ const onChange = jest.fn()
11
+ const view = render(<SearchField term="" onChange={onChange} />)
12
+
13
+ fireEvent.changeText(view.getByLabelText(inputLabel), 'budget')
14
+
15
+ expect(onChange).toHaveBeenCalledWith('budget')
16
+ })
17
+
18
+ it('shows the clear button only for a non-empty term and clears on press', () => {
19
+ const onChange = jest.fn()
20
+ const view = render(<SearchField term="" onChange={onChange} />)
21
+
22
+ expect(view.queryByLabelText(clearLabel)).toBeNull()
23
+
24
+ view.rerender(<SearchField term="budget" onChange={onChange} />)
25
+ fireEvent.press(view.getByLabelText(clearLabel))
26
+
27
+ expect(onChange).toHaveBeenCalledWith('')
28
+ })
29
+ })
@@ -0,0 +1,34 @@
1
+ import React from 'react'
2
+ import BlankState from '../../../components/primitive/blank_state_primitive'
3
+
4
+ export function SearchPromptBlankState() {
5
+ return (
6
+ <BlankState.Root>
7
+ <BlankState.Imagery name="general.search" />
8
+ <BlankState.Content>
9
+ <BlankState.Heading>Search chat</BlankState.Heading>
10
+ <BlankState.Text>
11
+ Find conversations by title, or search for words from a message.
12
+ </BlankState.Text>
13
+ </BlankState.Content>
14
+ </BlankState.Root>
15
+ )
16
+ }
17
+
18
+ interface NoResultsBlankStateProps {
19
+ term: string
20
+ }
21
+
22
+ export function NoResultsBlankState({ term }: NoResultsBlankStateProps) {
23
+ return (
24
+ <BlankState.Root>
25
+ <BlankState.Imagery name="general.search" />
26
+ <BlankState.Content>
27
+ <BlankState.Heading>No results</BlankState.Heading>
28
+ <BlankState.Text>
29
+ Nothing matches &ldquo;{term}.&rdquo; Try a conversation title, or a word from a message.
30
+ </BlankState.Text>
31
+ </BlankState.Content>
32
+ </BlankState.Root>
33
+ )
34
+ }
@@ -0,0 +1,81 @@
1
+ import { useRef } from 'react'
2
+ import { Pressable, StyleSheet, TextInput, View } from 'react-native'
3
+ import { Icon } from '../../../components'
4
+ import { AutoFocusAwareTextInput } from '../../../components/display/text_input'
5
+ import { useTheme } from '../../../hooks'
6
+
7
+ const PLACEHOLDER = 'Search titles and messages'
8
+
9
+ interface SearchFieldProps {
10
+ term: string
11
+ onChange: (term: string) => void
12
+ }
13
+
14
+ export function SearchField({ term, onChange }: SearchFieldProps) {
15
+ const styles = useStyles()
16
+ const { colors } = useTheme()
17
+ const inputRef = useRef<TextInput>(null)
18
+
19
+ const clear = () => {
20
+ onChange('')
21
+ inputRef.current?.clear()
22
+ inputRef.current?.focus()
23
+ }
24
+
25
+ return (
26
+ <View style={styles.container}>
27
+ <View style={styles.field}>
28
+ <Icon name="general.search" size={16} color={colors.iconColorDefaultSecondary} />
29
+ <AutoFocusAwareTextInput
30
+ autoFocus
31
+ autoCorrect={false}
32
+ inputRef={inputRef}
33
+ placeholder={PLACEHOLDER}
34
+ placeholderTextColor={colors.textColorDefaultPlaceholder}
35
+ accessibilityLabel={PLACEHOLDER}
36
+ value={term}
37
+ onChangeText={onChange}
38
+ returnKeyType="search"
39
+ style={styles.input}
40
+ />
41
+ {term.length > 0 && (
42
+ <Pressable
43
+ onPress={clear}
44
+ hitSlop={8}
45
+ accessibilityRole="button"
46
+ accessibilityLabel="Clear search"
47
+ >
48
+ <Icon name="general.x" size={12} color={colors.iconColorDefaultSecondary} />
49
+ </Pressable>
50
+ )}
51
+ </View>
52
+ </View>
53
+ )
54
+ }
55
+
56
+ const useStyles = () => {
57
+ const { colors } = useTheme()
58
+
59
+ return StyleSheet.create({
60
+ container: {
61
+ paddingHorizontal: 16,
62
+ paddingVertical: 8,
63
+ },
64
+ field: {
65
+ flexDirection: 'row',
66
+ alignItems: 'center',
67
+ gap: 8,
68
+ borderWidth: 1,
69
+ borderColor: colors.borderColorDefaultBase,
70
+ borderRadius: 8,
71
+ paddingHorizontal: 12,
72
+ paddingVertical: 8,
73
+ },
74
+ input: {
75
+ flex: 1,
76
+ color: colors.textColorDefaultPrimary,
77
+ fontSize: 16,
78
+ paddingVertical: 2,
79
+ },
80
+ })
81
+ }
@@ -0,0 +1,41 @@
1
+ import { ParamListBase } from '@react-navigation/native'
2
+ import {
3
+ NativeStackNavigationOptions,
4
+ NativeStackScreenProps,
5
+ } from '@react-navigation/native-stack'
6
+ import React, { useState } from 'react'
7
+ import { StyleSheet, View } from 'react-native'
8
+ import { KeyboardView } from '../../components'
9
+ import {
10
+ composeOptions,
11
+ withMinimalBack,
12
+ } from '../../components/display/platform_modal_header_buttons'
13
+ import { SearchPromptBlankState } from './components/search_blank_states'
14
+ import { SearchField } from './components/search_field'
15
+
16
+ export const SearchScreenOptions = ({
17
+ navigation,
18
+ }: NativeStackScreenProps<ParamListBase>): NativeStackNavigationOptions =>
19
+ composeOptions(
20
+ { title: 'Search', animation: 'fade' },
21
+ withMinimalBack({ onPress: () => navigation.goBack() })
22
+ )
23
+
24
+ export function SearchScreen() {
25
+ const [term, setTerm] = useState('')
26
+
27
+ return (
28
+ <KeyboardView>
29
+ <View style={styles.container} testID="search-screen">
30
+ <SearchField term={term} onChange={setTerm} />
31
+ <SearchPromptBlankState />
32
+ </View>
33
+ </KeyboardView>
34
+ )
35
+ }
36
+
37
+ const styles = StyleSheet.create({
38
+ container: {
39
+ flex: 1,
40
+ },
41
+ })
@@ -39,6 +39,7 @@ export interface CollectionMeta {
39
39
  count: number
40
40
  totalCount: number
41
41
  next?: NextPageCursor
42
+ prev?: NextPageCursor
42
43
  parent?: ResourceObject
43
44
  [attributeName: string]: unknown
44
45
  }
@@ -46,3 +46,12 @@ export interface ConversationResource {
46
46
  unreadReaction: boolean
47
47
  updatedAt: string
48
48
  }
49
+
50
+ export type ConversationAvatarData = Pick<
51
+ ConversationResource,
52
+ | 'customAvatarType'
53
+ | 'customAvatarKey'
54
+ | 'customAvatarColor'
55
+ | 'customAvatarImageUrl'
56
+ | 'previewAvatarUrls'
57
+ >
@@ -14,3 +14,4 @@ export * from './services'
14
14
  export * from './organization'
15
15
  export * from './group_membership'
16
16
  export * from './group_resource'
17
+ export * from './search_result'
@@ -0,0 +1,32 @@
1
+ import type { ConversationAvatarData } from './conversation'
2
+
3
+ interface BaseSearchResultResource {
4
+ id: string
5
+ title: string
6
+ url: string
7
+ }
8
+
9
+ export interface SnippetSegment {
10
+ text: string
11
+ match: boolean
12
+ }
13
+
14
+ export interface ConversationSearchResultResource extends BaseSearchResultResource {
15
+ type: 'conversation'
16
+ extra: {
17
+ avatar: ConversationAvatarData
18
+ }
19
+ }
20
+
21
+ export interface MessageSearchResultResource extends BaseSearchResultResource {
22
+ type: 'message'
23
+ extra: {
24
+ conversationId: number
25
+ authorName: string
26
+ snippet: SnippetSegment[]
27
+ createdAt: string
28
+ avatar: ConversationAvatarData
29
+ }
30
+ }
31
+
32
+ export type SearchResultResource = ConversationSearchResultResource | MessageSearchResultResource
@@ -0,0 +1,24 @@
1
+ import {
2
+ getSearchResultsQueryKey,
3
+ getSearchResultsRequestArgs,
4
+ } from '../request/get_search_results'
5
+
6
+ describe('getSearchResultsRequestArgs', () => {
7
+ it('requests the first page of search results for the term', () => {
8
+ expect(getSearchResultsRequestArgs('potluck')).toEqual({
9
+ url: '/search_results',
10
+ data: {
11
+ q: 'potluck',
12
+ perPage: 20,
13
+ fields: { SearchResult: ['type', 'title', 'url', 'extra'] },
14
+ },
15
+ })
16
+ })
17
+ })
18
+
19
+ describe('getSearchResultsQueryKey', () => {
20
+ it('changes with the term', () => {
21
+ expect(getSearchResultsQueryKey('potluck')).not.toEqual(getSearchResultsQueryKey('picnic'))
22
+ expect(getSearchResultsQueryKey('potluck')).toEqual(getSearchResultsQueryKey('potluck'))
23
+ })
24
+ })
@@ -1,4 +1,5 @@
1
1
  import { InfiniteData, QueryClient } from '@tanstack/react-query'
2
+ import { buildTestQueryClient } from '../../../__utils__/query_client'
2
3
  import type { ApiCollection, MessageResource } from '../../../types'
3
4
  import type { PersonResource } from '../../../types/resources/person'
4
5
  import { updateCacheWithMessage } from '../messages_cache'
@@ -44,7 +45,7 @@ describe('updateCacheWithMessage on message.created', () => {
44
45
  let queryClient: QueryClient
45
46
 
46
47
  beforeEach(() => {
47
- queryClient = new QueryClient()
48
+ queryClient = buildTestQueryClient()
48
49
  seed(
49
50
  queryClient,
50
51
  message({ id: '01B-temp', idempotentKey: 'key-b', pending: true }),