@planningcenter/chat-react-native 4.5.1-rc.0 → 4.6.0-qa-1063.1

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 (182) hide show
  1. package/assets/powered_by_giphy.png +0 -0
  2. package/assets/powered_by_giphy_dark.png +0 -0
  3. package/build/components/conversation/attachments/giphy_attachment.d.ts.map +1 -1
  4. package/build/components/conversation/attachments/giphy_attachment.js +2 -2
  5. package/build/components/conversation/attachments/giphy_attachment.js.map +1 -1
  6. package/build/components/conversation/attachments/image_attachment.d.ts.map +1 -1
  7. package/build/components/conversation/attachments/image_attachment.js +5 -3
  8. package/build/components/conversation/attachments/image_attachment.js.map +1 -1
  9. package/build/components/conversation/message_form.d.ts.map +1 -1
  10. package/build/components/conversation/message_form.js +2 -2
  11. package/build/components/conversation/message_form.js.map +1 -1
  12. package/build/components/conversation/message_list.d.ts.map +1 -1
  13. package/build/components/conversation/message_list.js +155 -123
  14. package/build/components/conversation/message_list.js.map +1 -1
  15. package/build/components/conversations/conversations.d.ts.map +1 -1
  16. package/build/components/conversations/conversations.js +1 -0
  17. package/build/components/conversations/conversations.js.map +1 -1
  18. package/build/components/display/conversation_avatar.d.ts +3 -1
  19. package/build/components/display/conversation_avatar.d.ts.map +1 -1
  20. package/build/components/display/conversation_avatar.js +77 -66
  21. package/build/components/display/conversation_avatar.js.map +1 -1
  22. package/build/components/display/keyboard_scroll_view.d.ts.map +1 -1
  23. package/build/components/display/keyboard_scroll_view.js +1 -0
  24. package/build/components/display/keyboard_scroll_view.js.map +1 -1
  25. package/build/components/page/page_error_boundary.d.ts +9 -1
  26. package/build/components/page/page_error_boundary.d.ts.map +1 -1
  27. package/build/components/page/page_error_boundary.js +56 -31
  28. package/build/components/page/page_error_boundary.js.map +1 -1
  29. package/build/hooks/use_conversation_avatar_update.d.ts +4 -3
  30. package/build/hooks/use_conversation_avatar_update.d.ts.map +1 -1
  31. package/build/hooks/use_conversation_avatar_update.js +146 -48
  32. package/build/hooks/use_conversation_avatar_update.js.map +1 -1
  33. package/build/icons/font_awesome.js +6 -6
  34. package/build/icons/font_awesome.js.map +1 -1
  35. package/build/navigation/index.d.ts.map +1 -1
  36. package/build/navigation/index.js +3 -1
  37. package/build/navigation/index.js.map +1 -1
  38. package/build/navigation/page_error_fallbacks.d.ts +7 -0
  39. package/build/navigation/page_error_fallbacks.d.ts.map +1 -0
  40. package/build/navigation/page_error_fallbacks.js +7 -0
  41. package/build/navigation/page_error_fallbacks.js.map +1 -0
  42. package/build/navigation/screenLayout.d.ts.map +1 -1
  43. package/build/navigation/screenLayout.js +10 -6
  44. package/build/navigation/screenLayout.js.map +1 -1
  45. package/build/screens/age_check/age_check_required_screen.d.ts.map +1 -1
  46. package/build/screens/age_check/age_check_required_screen.js +1 -0
  47. package/build/screens/age_check/age_check_required_screen.js.map +1 -1
  48. package/build/screens/age_check/age_check_underage_screen.d.ts.map +1 -1
  49. package/build/screens/age_check/age_check_underage_screen.js +2 -1
  50. package/build/screens/age_check/age_check_underage_screen.js.map +1 -1
  51. package/build/screens/attachment_actions/attachment_actions_screen.d.ts.map +1 -1
  52. package/build/screens/attachment_actions/attachment_actions_screen.js +5 -2
  53. package/build/screens/attachment_actions/attachment_actions_screen.js.map +1 -1
  54. package/build/screens/avatar_picker/avatar_picker_screen.d.ts.map +1 -1
  55. package/build/screens/avatar_picker/avatar_picker_screen.js +76 -66
  56. package/build/screens/avatar_picker/avatar_picker_screen.js.map +1 -1
  57. package/build/screens/avatar_picker/constants.d.ts.map +1 -1
  58. package/build/screens/avatar_picker/constants.js +5 -3
  59. package/build/screens/avatar_picker/constants.js.map +1 -1
  60. package/build/screens/bug_report_screen.d.ts.map +1 -1
  61. package/build/screens/bug_report_screen.js +3 -3
  62. package/build/screens/bug_report_screen.js.map +1 -1
  63. package/build/screens/conversation_details_screen.d.ts.map +1 -1
  64. package/build/screens/conversation_details_screen.js +1 -0
  65. package/build/screens/conversation_details_screen.js.map +1 -1
  66. package/build/screens/conversation_new/components/form_list.d.ts.map +1 -1
  67. package/build/screens/conversation_new/components/form_list.js +1 -0
  68. package/build/screens/conversation_new/components/form_list.js.map +1 -1
  69. package/build/screens/conversation_new/components/groups_form.js +25 -18
  70. package/build/screens/conversation_new/components/groups_form.js.map +1 -1
  71. package/build/screens/conversation_new/components/services_form.js +51 -40
  72. package/build/screens/conversation_new/components/services_form.js.map +1 -1
  73. package/build/screens/conversation_select_recipients/conversation_new_entry_screen.d.ts.map +1 -1
  74. package/build/screens/conversation_select_recipients/conversation_new_entry_screen.js +1 -0
  75. package/build/screens/conversation_select_recipients/conversation_new_entry_screen.js.map +1 -1
  76. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.d.ts.map +1 -1
  77. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js +332 -291
  78. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js.map +1 -1
  79. package/build/screens/conversation_select_recipients/conversation_select_group_recipients_screen.d.ts.map +1 -1
  80. package/build/screens/conversation_select_recipients/conversation_select_group_recipients_screen.js +2 -1
  81. package/build/screens/conversation_select_recipients/conversation_select_group_recipients_screen.js.map +1 -1
  82. package/build/screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen.d.ts.map +1 -1
  83. package/build/screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen.js +1 -0
  84. package/build/screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen.js.map +1 -1
  85. package/build/screens/design_system_screen.js +6 -3
  86. package/build/screens/design_system_screen.js.map +1 -1
  87. package/build/screens/get_help_screen.js +57 -63
  88. package/build/screens/get_help_screen.js.map +1 -1
  89. package/build/screens/group_notification_settings_screen.js +3 -2
  90. package/build/screens/group_notification_settings_screen.js.map +1 -1
  91. package/build/screens/notification_settings_screen.d.ts.map +1 -1
  92. package/build/screens/notification_settings_screen.js +1 -0
  93. package/build/screens/notification_settings_screen.js.map +1 -1
  94. package/build/screens/preferred_app_selection_screen.js +45 -39
  95. package/build/screens/preferred_app_selection_screen.js.map +1 -1
  96. package/build/screens/search/components/search_results_list.d.ts +4 -1
  97. package/build/screens/search/components/search_results_list.d.ts.map +1 -1
  98. package/build/screens/search/components/search_results_list.js +136 -110
  99. package/build/screens/search/components/search_results_list.js.map +1 -1
  100. package/build/screens/search/search_screen.d.ts.map +1 -1
  101. package/build/screens/search/search_screen.js +21 -28
  102. package/build/screens/search/search_screen.js.map +1 -1
  103. package/build/screens/send_giphy_screen.d.ts.map +1 -1
  104. package/build/screens/send_giphy_screen.js +93 -136
  105. package/build/screens/send_giphy_screen.js.map +1 -1
  106. package/build/screens/settings_screen.d.ts.map +1 -1
  107. package/build/screens/settings_screen.js +7 -6
  108. package/build/screens/settings_screen.js.map +1 -1
  109. package/build/utils/index.d.ts +1 -0
  110. package/build/utils/index.d.ts.map +1 -1
  111. package/build/utils/index.js +1 -0
  112. package/build/utils/index.js.map +1 -1
  113. package/build/utils/membership_sync_info_text.d.ts +2 -0
  114. package/build/utils/membership_sync_info_text.d.ts.map +1 -0
  115. package/build/utils/membership_sync_info_text.js +4 -0
  116. package/build/utils/membership_sync_info_text.js.map +1 -0
  117. package/build/utils/native_adapters/linking.d.ts +11 -3
  118. package/build/utils/native_adapters/linking.d.ts.map +1 -1
  119. package/build/utils/native_adapters/linking.js.map +1 -1
  120. package/build/vendor/font_awesome_pro_solid_icons.d.ts +6 -6
  121. package/build/vendor/font_awesome_pro_solid_icons.d.ts.map +1 -1
  122. package/build/vendor/font_awesome_pro_solid_icons.js +6 -6
  123. package/build/vendor/font_awesome_pro_solid_icons.js.map +1 -1
  124. package/package.json +5 -5
  125. package/src/__tests__/components/conversation/attachments/giphy_attachment.test.tsx +76 -0
  126. package/src/__tests__/screens/get_help_screen.test.ts +36 -0
  127. package/src/__utils__/render_with_query_client.tsx +13 -0
  128. package/src/components/conversation/__tests__/message_list.test.tsx +4 -0
  129. package/src/components/conversation/attachments/giphy_attachment.tsx +2 -3
  130. package/src/components/conversation/attachments/image_attachment.tsx +2 -3
  131. package/src/components/conversation/message_form.tsx +1 -1
  132. package/src/components/conversation/message_list.tsx +6 -0
  133. package/src/components/conversations/__tests__/conversation_preview.test.tsx +2 -2
  134. package/src/components/conversations/conversations.tsx +1 -0
  135. package/src/components/display/__tests__/conversation_avatar.test.tsx +94 -0
  136. package/src/components/display/conversation_avatar.tsx +9 -2
  137. package/src/components/display/keyboard_scroll_view.tsx +1 -0
  138. package/src/components/page/__tests__/page_error_boundary.test.tsx +33 -0
  139. package/src/components/page/page_error_boundary.tsx +43 -12
  140. package/src/hooks/__tests__/use_conversation_avatar_update.test.tsx +40 -0
  141. package/src/hooks/use_conversation_avatar_update.ts +67 -11
  142. package/src/icons/font_awesome.ts +12 -12
  143. package/src/navigation/index.tsx +6 -2
  144. package/src/navigation/page_error_fallbacks.ts +14 -0
  145. package/src/navigation/screenLayout.tsx +3 -1
  146. package/src/screens/age_check/age_check_required_screen.tsx +5 -1
  147. package/src/screens/age_check/age_check_underage_screen.tsx +2 -1
  148. package/src/screens/attachment_actions/__tests__/attachment_actions_screen.test.tsx +37 -1
  149. package/src/screens/attachment_actions/attachment_actions_screen.tsx +3 -2
  150. package/src/screens/avatar_picker/__tests__/avatar_picker_screen.test.tsx +67 -0
  151. package/src/screens/avatar_picker/__tests__/constants.test.ts +16 -0
  152. package/src/screens/avatar_picker/avatar_picker_screen.tsx +7 -1
  153. package/src/screens/avatar_picker/constants.ts +11 -6
  154. package/src/screens/bug_report_screen.tsx +3 -11
  155. package/src/screens/conversation_details_screen.tsx +1 -0
  156. package/src/screens/conversation_new/components/form_list.tsx +1 -0
  157. package/src/screens/conversation_new/components/groups_form.tsx +2 -2
  158. package/src/screens/conversation_new/components/services_form.tsx +2 -2
  159. package/src/screens/conversation_select_recipients/__tests__/conversation_select_direct_message_recipients_screen.test.tsx +100 -0
  160. package/src/screens/conversation_select_recipients/conversation_new_entry_screen.tsx +4 -1
  161. package/src/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.tsx +78 -68
  162. package/src/screens/conversation_select_recipients/conversation_select_group_recipients_screen.tsx +2 -1
  163. package/src/screens/conversation_select_recipients/conversation_select_teams_i_lead_recipients_screen.tsx +1 -0
  164. package/src/screens/design_system_screen.tsx +10 -6
  165. package/src/screens/get_help_screen.tsx +5 -5
  166. package/src/screens/group_notification_settings_screen.tsx +3 -3
  167. package/src/screens/notification_settings_screen.tsx +1 -0
  168. package/src/screens/preferred_app_selection_screen.tsx +4 -4
  169. package/src/screens/search/__tests__/search_screen.test.tsx +11 -12
  170. package/src/screens/search/components/__tests__/conversation_results.test.tsx +14 -5
  171. package/src/screens/search/components/__tests__/message_result_row.test.tsx +5 -4
  172. package/src/screens/search/components/__tests__/search_results_list.test.tsx +10 -5
  173. package/src/screens/search/components/search_results_list.tsx +34 -13
  174. package/src/screens/search/search_screen.tsx +8 -18
  175. package/src/screens/send_giphy_screen.tsx +13 -44
  176. package/src/screens/settings_screen.tsx +25 -25
  177. package/src/utils/__tests__/membership_sync_info_text.test.ts +15 -0
  178. package/src/utils/index.ts +1 -0
  179. package/src/utils/membership_sync_info_text.ts +3 -0
  180. package/src/utils/native_adapters/__tests__/linking.test.ts +12 -0
  181. package/src/utils/native_adapters/linking.ts +12 -3
  182. package/src/vendor/font_awesome_pro_solid_icons.ts +6 -6
@@ -2,7 +2,7 @@ import { PlatformPressable } from '@react-navigation/elements'
2
2
  import { StaticScreenProps, useNavigation } from '@react-navigation/native'
3
3
  import type { NativeStackNavigationProp } from '@react-navigation/native-stack'
4
4
  import React, { useEffect } from 'react'
5
- import { Platform, StyleSheet, View } from 'react-native'
5
+ import { Platform, ScrollView, StyleSheet, View } from 'react-native'
6
6
  import { Heading, Icon, Text } from '../components'
7
7
  import { useTheme } from '../hooks'
8
8
  import { platformFontWeightBold } from '../utils/styles'
@@ -38,7 +38,7 @@ export function GroupNotificationSettingsScreen({ route }: GroupNotificationSett
38
38
  }
39
39
 
40
40
  return (
41
- <View style={styles.container}>
41
+ <ScrollView contentInsetAdjustmentBehavior="automatic" style={styles.container}>
42
42
  <View style={styles.sectionOuter}>
43
43
  <View style={styles.sectionInner}>
44
44
  <Heading variant="h2" style={styles.sectionHeading}>
@@ -76,7 +76,7 @@ export function GroupNotificationSettingsScreen({ route }: GroupNotificationSett
76
76
  )}
77
77
  </View>
78
78
  </PlatformPressable>
79
- </View>
79
+ </ScrollView>
80
80
  )
81
81
  }
82
82
 
@@ -123,6 +123,7 @@ export function NotificationSettingsScreen({}: NotificationSettingsScreenProps)
123
123
  return (
124
124
  <View style={styles.listContainer}>
125
125
  <FlatList
126
+ contentInsetAdjustmentBehavior="automatic"
126
127
  data={listData as SectionListData}
127
128
  contentContainerStyle={styles.contentContainer}
128
129
  renderItem={({ item, index }) => {
@@ -2,7 +2,7 @@ import { PlatformPressable } from '@react-navigation/elements'
2
2
  import { StaticScreenProps } from '@react-navigation/native'
3
3
  import { useMutation } from '@tanstack/react-query'
4
4
  import React, { type PropsWithChildren } from 'react'
5
- import { Image, StyleSheet, View, type ViewStyle } from 'react-native'
5
+ import { Image, ScrollView, StyleSheet, View, type ViewStyle } from 'react-native'
6
6
  import { Heading, Icon, Text } from '../components'
7
7
  import { useApiClient, useTheme } from '../hooks'
8
8
  import { useAppName } from '../hooks/use_app_name'
@@ -45,7 +45,7 @@ export function PreferredAppSelectionScreen({ route }: PreferredAppSelectionScre
45
45
  const sectionTitle = chatType ? chatTypeLabel(chatType.title) : undefined
46
46
 
47
47
  return (
48
- <View style={styles.container}>
48
+ <ScrollView contentInsetAdjustmentBehavior="automatic" contentContainerStyle={styles.container}>
49
49
  <View style={styles.section}>
50
50
  <Heading variant="h2" style={styles.sectionHeading}>
51
51
  {sectionTitle}
@@ -64,7 +64,7 @@ export function PreferredAppSelectionScreen({ route }: PreferredAppSelectionScre
64
64
  </PressableRow>
65
65
  ))}
66
66
  </View>
67
- </View>
67
+ </ScrollView>
68
68
  )
69
69
  }
70
70
 
@@ -118,7 +118,7 @@ const PressableRow = ({
118
118
 
119
119
  const styles = StyleSheet.create({
120
120
  container: {
121
- flex: 1,
121
+ flexGrow: 1,
122
122
  },
123
123
  section: {
124
124
  paddingTop: 24,
@@ -1,6 +1,7 @@
1
- import { act, fireEvent, render } from '@testing-library/react-native'
1
+ import { act, fireEvent } from '@testing-library/react-native'
2
2
  import React from 'react'
3
3
  import { Keyboard, ScrollView } from 'react-native'
4
+ import { renderWithQueryClient } from '../../../__utils__/render_with_query_client'
4
5
  import type { useSearchResults } from '../../../hooks/use_search_results'
5
6
  import type {
6
7
  ConversationSearchResultResource,
@@ -71,7 +72,7 @@ const renderWithResults = () => {
71
72
  hasNextPage: false,
72
73
  isFetchingNextPage: false,
73
74
  })
74
- const view = render(<SearchScreen />)
75
+ const view = renderWithQueryClient(<SearchScreen />)
75
76
  const input = view.getByLabelText(inputLabel)
76
77
  fireEvent.changeText(input, 'bud')
77
78
  fireEvent.changeText(input, 'budget')
@@ -99,37 +100,35 @@ afterEach(() => jest.useRealTimers())
99
100
 
100
101
  describe('SearchScreen', () => {
101
102
  it('searches once with the trimmed term after typing settles', () => {
102
- const view = render(<SearchScreen />)
103
+ const view = renderWithQueryClient(<SearchScreen />)
103
104
  const input = view.getByLabelText(inputLabel)
104
105
 
105
106
  fireEvent.changeText(input, 'bud')
106
107
  fireEvent.changeText(input, ' budget ')
107
108
 
108
109
  expect(view.getByText('Search chat')).toBeTruthy()
109
- expect(mockUseSearchResults).not.toHaveBeenCalled()
110
+ const searchedTerms = () =>
111
+ new Set(mockUseSearchResults.mock.calls.map(([term]) => term).filter(term => term.trim()))
112
+ expect([...searchedTerms()]).toEqual([])
110
113
 
111
114
  act(() => jest.advanceTimersByTime(200))
112
115
 
113
- const searchedTerms = new Set(mockUseSearchResults.mock.calls.map(([term]) => term))
114
- expect([...searchedTerms]).toEqual(['budget'])
116
+ expect([...searchedTerms()]).toEqual(['budget'])
115
117
  expect(view.queryByText('Search chat')).toBeNull()
116
118
  expect(view.getByLabelText('Loading results')).toBeTruthy()
117
119
  })
118
120
 
119
121
  it('lets the prompt scroll while taps still reach the field', () => {
120
- const view = render(<SearchScreen />)
122
+ const view = renderWithQueryClient(<SearchScreen />)
121
123
 
122
124
  const scrollView = view.UNSAFE_getByType(ScrollView)
123
125
  expect(scrollView.props.keyboardShouldPersistTaps).toBe('handled')
124
- expect(scrollView.props.contentContainerStyle).toMatchObject({
125
- flexGrow: 1,
126
- justifyContent: 'center',
127
- })
126
+ expect(scrollView.props.contentContainerStyle).toMatchObject({ flexGrow: 1 })
128
127
  expect(view.getByText('Search chat')).toBeTruthy()
129
128
  })
130
129
 
131
130
  it('returns to the prompt as soon as the term is cleared', () => {
132
- const view = render(<SearchScreen />)
131
+ const view = renderWithQueryClient(<SearchScreen />)
133
132
  const input = view.getByLabelText(inputLabel)
134
133
 
135
134
  fireEvent.changeText(input, 'budget')
@@ -1,5 +1,6 @@
1
- import { fireEvent, render } from '@testing-library/react-native'
1
+ import { fireEvent } from '@testing-library/react-native'
2
2
  import React from 'react'
3
+ import { renderWithQueryClient } from '../../../../__utils__/render_with_query_client'
3
4
  import type { ConversationSearchResultResource } from '../../../../types'
4
5
  import { ConversationResults } from '../conversation_results'
5
6
 
@@ -14,7 +15,9 @@ const buildResults = (count: number, prefix = 'Conversation') =>
14
15
 
15
16
  describe('ConversationResults', () => {
16
17
  it('caps at five rows until View more is pressed, then offers View less', () => {
17
- const view = render(<ConversationResults results={buildResults(6)} onSelect={jest.fn()} />)
18
+ const view = renderWithQueryClient(
19
+ <ConversationResults results={buildResults(6)} onSelect={jest.fn()} />
20
+ )
18
21
 
19
22
  expect(view.getByText('Conversation 5')).toBeTruthy()
20
23
  expect(view.queryByText('Conversation 6')).toBeNull()
@@ -27,14 +30,18 @@ describe('ConversationResults', () => {
27
30
  })
28
31
 
29
32
  it('renders no footer for five or fewer results', () => {
30
- const view = render(<ConversationResults results={buildResults(4)} onSelect={jest.fn()} />)
33
+ const view = renderWithQueryClient(
34
+ <ConversationResults results={buildResults(4)} onSelect={jest.fn()} />
35
+ )
31
36
 
32
37
  expect(view.getByText('Conversation 4')).toBeTruthy()
33
38
  expect(view.queryByText('View more')).toBeNull()
34
39
  })
35
40
 
36
41
  it('stays expanded when the parent re-renders with a new results array', () => {
37
- const view = render(<ConversationResults results={buildResults(6)} onSelect={jest.fn()} />)
42
+ const view = renderWithQueryClient(
43
+ <ConversationResults results={buildResults(6)} onSelect={jest.fn()} />
44
+ )
38
45
  fireEvent.press(view.getByText('View more'))
39
46
 
40
47
  view.rerender(<ConversationResults results={buildResults(6)} onSelect={jest.fn()} />)
@@ -46,7 +53,9 @@ describe('ConversationResults', () => {
46
53
  it('passes the pressed result and its position to onSelect', () => {
47
54
  const onSelect = jest.fn()
48
55
  const results = buildResults(2)
49
- const view = render(<ConversationResults results={results} onSelect={onSelect} />)
56
+ const view = renderWithQueryClient(
57
+ <ConversationResults results={results} onSelect={onSelect} />
58
+ )
50
59
 
51
60
  fireEvent.press(view.getByText('Conversation 2'))
52
61
 
@@ -1,5 +1,6 @@
1
- import { fireEvent, render } from '@testing-library/react-native'
1
+ import { fireEvent } from '@testing-library/react-native'
2
2
  import React from 'react'
3
+ import { renderWithQueryClient } from '../../../../__utils__/render_with_query_client'
3
4
  import type { MessageSearchResultResource } from '../../../../types/resources/search_result'
4
5
  import { formatDatePreview } from '../../../../utils/date'
5
6
  import { defaultTheme } from '../../../../utils/theme'
@@ -33,7 +34,7 @@ const interactionColor = defaultTheme('light').colors.interaction
33
34
 
34
35
  describe('MessageResultRow', () => {
35
36
  it('renders the title, author, snippet, and date', () => {
36
- const view = render(<MessageResultRow result={result} onPress={jest.fn()} />)
37
+ const view = renderWithQueryClient(<MessageResultRow result={result} onPress={jest.fn()} />)
37
38
 
38
39
  expect(view.getByText('Worship Team')).toBeTruthy()
39
40
  expect(view.getByText('Ada Lovelace:', { exact: false })).toBeTruthy()
@@ -44,7 +45,7 @@ describe('MessageResultRow', () => {
44
45
  })
45
46
 
46
47
  it('colors matched segments with the interaction color', () => {
47
- const view = render(<MessageResultRow result={result} onPress={jest.fn()} />)
48
+ const view = renderWithQueryClient(<MessageResultRow result={result} onPress={jest.fn()} />)
48
49
 
49
50
  expect(view.getByText('budget')).toHaveStyle({ color: interactionColor })
50
51
  expect(view.getByText('…planning the ')).not.toHaveStyle({ color: interactionColor })
@@ -53,7 +54,7 @@ describe('MessageResultRow', () => {
53
54
  it('exposes the row as a button with a composed label and reports presses', () => {
54
55
  const onPress = jest.fn()
55
56
  const date = formatDatePreview(result.extra.createdAt)
56
- const view = render(<MessageResultRow result={result} onPress={onPress} />)
57
+ const view = renderWithQueryClient(<MessageResultRow result={result} onPress={onPress} />)
57
58
 
58
59
  const row = view.getByRole('button', {
59
60
  name: `Worship Team, Ada Lovelace: …planning the budget meeting for next week, ${date}`,
@@ -1,6 +1,7 @@
1
- import { fireEvent, render } from '@testing-library/react-native'
1
+ import { fireEvent } from '@testing-library/react-native'
2
2
  import React from 'react'
3
3
  import { FlatList } from 'react-native'
4
+ import { renderWithQueryClient } from '../../../../__utils__/render_with_query_client'
4
5
  import type { useSearchResults } from '../../../../hooks/use_search_results'
5
6
  import type {
6
7
  ConversationSearchResultResource,
@@ -49,10 +50,14 @@ const messageResult = (id: string): MessageSearchResultResource => ({
49
50
  },
50
51
  })
51
52
 
53
+ const slots = { header: <></>, prompt: <></> }
54
+
52
55
  const renderList = (state: Partial<SearchState>, onSettled = jest.fn()) => {
53
56
  mockUseSearchResults.mockReturnValue(searchState(state))
54
- const list = () => <SearchResultsList term="potluck" onSelect={jest.fn()} onSettled={onSettled} />
55
- const view = render(list())
57
+ const list = () => (
58
+ <SearchResultsList term="potluck" onSelect={jest.fn()} onSettled={onSettled} {...slots} />
59
+ )
60
+ const view = renderWithQueryClient(list())
56
61
  const rerenderWith = (next: Partial<SearchState>) => {
57
62
  mockUseSearchResults.mockReturnValue(searchState(next))
58
63
  view.rerender(list())
@@ -129,8 +134,8 @@ describe('SearchResultsList', () => {
129
134
  const onSelect = jest.fn()
130
135
  const results = [conversationResult('1'), messageResult('1'), messageResult('2')]
131
136
  mockUseSearchResults.mockReturnValue(searchState({ results }))
132
- const view = render(
133
- <SearchResultsList term="potluck" onSelect={onSelect} onSettled={jest.fn()} />
137
+ const view = renderWithQueryClient(
138
+ <SearchResultsList term="potluck" onSelect={onSelect} onSettled={jest.fn()} {...slots} />
134
139
  )
135
140
 
136
141
  fireEvent.press(view.getByLabelText(/^Message 2/))
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useRef } from 'react'
1
+ import React, { ReactElement, useEffect, useRef } from 'react'
2
2
  import { FlatList, StyleSheet, View } from 'react-native'
3
3
  import { Banner, Spinner, Text, TextButton } from '../../../components'
4
4
  import { useSearchResults } from '../../../hooks/use_search_results'
@@ -23,9 +23,17 @@ interface SearchResultsListProps {
23
23
  term: string
24
24
  onSelect: (result: SearchResultResource, position: number) => void
25
25
  onSettled: (term: string, counts: SearchResultCounts) => void
26
+ header: ReactElement
27
+ prompt: ReactElement
26
28
  }
27
29
 
28
- export function SearchResultsList({ term, onSelect, onSettled }: SearchResultsListProps) {
30
+ export function SearchResultsList({
31
+ term,
32
+ onSelect,
33
+ onSettled,
34
+ header,
35
+ prompt,
36
+ }: SearchResultsListProps) {
29
37
  const {
30
38
  results,
31
39
  failedTypes,
@@ -36,9 +44,10 @@ export function SearchResultsList({ term, onSelect, onSettled }: SearchResultsLi
36
44
  hasNextPage,
37
45
  isFetchingNextPage,
38
46
  } = useSearchResults(term)
39
- const conversationResults = results.filter(isConversationResult)
40
- const messageResults = results.filter(isMessageResult)
41
- const settled = !isPending && !isError
47
+ const searching = term.trim().length > 0
48
+ const conversationResults = searching ? results.filter(isConversationResult) : []
49
+ const messageResults = searching ? results.filter(isMessageResult) : []
50
+ const settled = searching && !isPending && !isError
42
51
 
43
52
  const settledTermRef = useRef<string | undefined>(undefined)
44
53
 
@@ -56,6 +65,7 @@ export function SearchResultsList({ term, onSelect, onSettled }: SearchResultsLi
56
65
  <FlatList
57
66
  data={messageResults}
58
67
  keyExtractor={item => item.id}
68
+ contentInsetAdjustmentBehavior="automatic"
59
69
  keyboardShouldPersistTaps="handled"
60
70
  keyboardDismissMode="on-drag"
61
71
  contentContainerStyle={styles.content}
@@ -64,20 +74,27 @@ export function SearchResultsList({ term, onSelect, onSettled }: SearchResultsLi
64
74
  )}
65
75
  ListHeaderComponent={
66
76
  <>
77
+ {header}
67
78
  {conversationResults.length > 0 && (
68
79
  <ConversationResults results={conversationResults} onSelect={onSelect} />
69
80
  )}
70
- {failedTypes.includes('conversation') && <SectionFailure type="conversation" />}
81
+ {searching && failedTypes.includes('conversation') && (
82
+ <SectionFailure type="conversation" />
83
+ )}
71
84
  {messageResults.length > 0 && <ResultsSection title="Messages" />}
72
85
  </>
73
86
  }
74
87
  ListEmptyComponent={
75
- <ListEmpty
76
- term={term}
77
- isError={isError}
78
- isPending={isPending}
79
- noResults={results.length === 0 && failedTypes.length === 0}
80
- />
88
+ searching ? (
89
+ <ListEmpty
90
+ term={term}
91
+ isError={isError}
92
+ isPending={isPending}
93
+ noResults={results.length === 0 && failedTypes.length === 0}
94
+ />
95
+ ) : (
96
+ <View style={styles.prompt}>{prompt}</View>
97
+ )
81
98
  }
82
99
  ListFooterComponent={
83
100
  <>
@@ -91,7 +108,7 @@ export function SearchResultsList({ term, onSelect, onSettled }: SearchResultsLi
91
108
  Try again
92
109
  </TextButton>
93
110
  )}
94
- {failedTypes.includes('message') && <SectionFailure type="message" />}
111
+ {searching && failedTypes.includes('message') && <SectionFailure type="message" />}
95
112
  </>
96
113
  }
97
114
  onEndReached={() => {
@@ -149,6 +166,10 @@ const styles = StyleSheet.create({
149
166
  content: {
150
167
  flexGrow: 1,
151
168
  },
169
+ prompt: {
170
+ flexGrow: 1,
171
+ justifyContent: 'center',
172
+ },
152
173
  banner: {
153
174
  margin: 16,
154
175
  },
@@ -4,7 +4,7 @@ import {
4
4
  NativeStackScreenProps,
5
5
  } from '@react-navigation/native-stack'
6
6
  import React, { useRef, useState } from 'react'
7
- import { Keyboard, ScrollView, StyleSheet, View } from 'react-native'
7
+ import { Keyboard, StyleSheet, View } from 'react-native'
8
8
  import { KeyboardView } from '../../components'
9
9
  import {
10
10
  composeOptions,
@@ -64,19 +64,13 @@ export function SearchScreen() {
64
64
  return (
65
65
  <KeyboardView>
66
66
  <View style={styles.container} testID="search-screen">
67
- <SearchField term={term} onChange={setTerm} />
68
- {debouncedTerm.length > 0 ? (
69
- <SearchResultsList
70
- key={debouncedTerm}
71
- term={debouncedTerm}
72
- onSelect={openResult}
73
- onSettled={publishSearch}
74
- />
75
- ) : (
76
- <ScrollView contentContainerStyle={styles.prompt} keyboardShouldPersistTaps="handled">
77
- <SearchPromptBlankState />
78
- </ScrollView>
79
- )}
67
+ <SearchResultsList
68
+ term={debouncedTerm}
69
+ onSelect={openResult}
70
+ onSettled={publishSearch}
71
+ header={<SearchField term={term} onChange={setTerm} />}
72
+ prompt={<SearchPromptBlankState />}
73
+ />
80
74
  </View>
81
75
  </KeyboardView>
82
76
  )
@@ -86,8 +80,4 @@ const styles = StyleSheet.create({
86
80
  container: {
87
81
  flex: 1,
88
82
  },
89
- prompt: {
90
- flexGrow: 1,
91
- justifyContent: 'center',
92
- },
93
83
  })
@@ -8,7 +8,6 @@ import FormSheet, { getFormSheetScreenOptions } from '../components/primitive/fo
8
8
  import { useCreateAndroidRippleColor, useTheme } from '../hooks'
9
9
  import { useGiphy } from '../hooks/use_giphy'
10
10
  import { useMessageCreateOrUpdate } from '../hooks/use_message_create_or_update'
11
- import { tokens } from '../vendor/tapestry/tokens'
12
11
 
13
12
  export const SendGiphyScreenOptions = getFormSheetScreenOptions({
14
13
  headerTitle: 'Send Giphy',
@@ -24,6 +23,7 @@ export type SendGiphyScreenProps = StaticScreenProps<{
24
23
  export function SendGiphyScreen({ route }: SendGiphyScreenProps) {
25
24
  const { conversation_id, reply_root_id, search_term } = route.params
26
25
  const styles = useStyles()
26
+ const { colors } = useTheme()
27
27
  const navigation = useNavigation()
28
28
 
29
29
  const { isPending, mutate } = useMessageCreateOrUpdate({
@@ -78,15 +78,18 @@ export function SendGiphyScreen({ route }: SendGiphyScreenProps) {
78
78
  goBack({ clearInput: true })
79
79
  }
80
80
 
81
+ const poweredByGiphyImage =
82
+ colors.name === 'dark'
83
+ ? require('../../assets/powered_by_giphy_dark.png')
84
+ : require('../../assets/powered_by_giphy.png')
85
+
81
86
  return (
82
87
  <FormSheet.Root contentStyle={styles.container}>
83
- <View style={styles.poweredByGiphyContainer}>
84
- <NativeImage
85
- alt="Powered by Giphy"
86
- style={styles.poweredByGiphyImage}
87
- source={{ uri: poweredByGiphyImage }}
88
- />
89
- </View>
88
+ <NativeImage
89
+ alt="Powered by Giphy"
90
+ style={styles.poweredByGiphyImage}
91
+ source={poweredByGiphyImage}
92
+ />
90
93
  <View style={styles.controlToolbar} accessibilityRole="toolbar">
91
94
  <View style={styles.paginateButtonGroup}>
92
95
  <PaginateButton
@@ -181,15 +184,10 @@ const useStyles = () => {
181
184
  flex: 0,
182
185
  flexGrow: 1,
183
186
  },
184
- poweredByGiphyContainer: {
185
- alignSelf: 'flex-start',
186
- padding: 4,
187
- borderRadius: 4,
188
- backgroundColor: colors.name === 'dark' ? tokens.colorNeutral68 : 'transparent',
189
- },
190
187
  poweredByGiphyImage: {
191
- width: 170,
188
+ alignSelf: 'flex-start',
192
189
  height: 20,
190
+ aspectRatio: 641 / 71,
193
191
  },
194
192
  controlToolbar: {
195
193
  flexDirection: 'row',
@@ -223,32 +221,3 @@ const useStyles = () => {
223
221
  },
224
222
  })
225
223
  }
226
-
227
- const poweredByGiphyImage = `data:image/png;base64,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
- GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABa9JREFUeNrsWy1z40gQla8EDAwE
229
- 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
- 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
- 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
- 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
- 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
- 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
- li1ZVLKGmN+GFDM8X3exlB6UCh4qUmTe9eRFKL96VTzVF/MshZ6sjg2tDknSF4pyECoTduALl69p
236
- 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
- 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
- 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
- 6EiGG7pIhgaQuDxv2XoSgGTO+N7avZK8B5JMKbT6p+mgzbPtOWIpWPNdh4rXqUOtZ2F/NFnSrqHV
240
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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`
@@ -1,7 +1,7 @@
1
1
  import { PlatformPressable } from '@react-navigation/elements'
2
2
  import { StaticScreenProps, useNavigation } from '@react-navigation/native'
3
3
  import React, { useCallback } from 'react'
4
- import { Platform, StyleSheet, View } from 'react-native'
4
+ import { Platform, ScrollView, StyleSheet, View } from 'react-native'
5
5
  import { useSafeAreaInsets } from 'react-native-safe-area-context'
6
6
  import { Heading, Icon, Text, VersionFooter } from '../components'
7
7
  import { Switch } from '../components/display/switch'
@@ -28,29 +28,31 @@ export function SettingsScreen({}: SettingsScreenProps) {
28
28
 
29
29
  return (
30
30
  <View style={styles.container}>
31
- <View style={styles.sectionOuter}>
32
- <View style={styles.sectionHeader}>
33
- <Heading variant="h2">Messages</Heading>
34
- </View>
35
- {directMessagesEligible && (
36
- <View style={styles.settingRow}>
37
- <View style={styles.settingRowText}>
38
- <Text>Allow direct messages</Text>
39
- <Text variant="tertiary">
40
- When off, you can't be added to new direct messages, and any you're already in will
41
- be turned off.
42
- </Text>
43
- </View>
44
- <Switch
45
- value={!directMessagesDisabled}
46
- onValueChange={enabled => setDirectMessagesDisabled(!enabled)}
47
- disabled={isMutating}
48
- />
31
+ <ScrollView contentInsetAdjustmentBehavior="automatic">
32
+ <View style={styles.sectionOuter}>
33
+ <View style={styles.sectionHeader}>
34
+ <Heading variant="h2">Messages</Heading>
49
35
  </View>
50
- )}
51
- <NavRow label="Notification settings" onPress={handleNotificationSettings} />
52
- {appName !== 'services' && <NavRow label="Get help" onPress={handleGetHelp} />}
53
- </View>
36
+ {directMessagesEligible && (
37
+ <View style={styles.settingRow}>
38
+ <View style={styles.settingRowText}>
39
+ <Text>Allow direct messages</Text>
40
+ <Text variant="tertiary">
41
+ When off, you can't be added to new direct messages, and any you're already in
42
+ will be turned off.
43
+ </Text>
44
+ </View>
45
+ <Switch
46
+ value={!directMessagesDisabled}
47
+ onValueChange={enabled => setDirectMessagesDisabled(!enabled)}
48
+ disabled={isMutating}
49
+ />
50
+ </View>
51
+ )}
52
+ <NavRow label="Notification settings" onPress={handleNotificationSettings} />
53
+ {appName !== 'services' && <NavRow label="Get help" onPress={handleGetHelp} />}
54
+ </View>
55
+ </ScrollView>
54
56
  <View style={styles.footer}>
55
57
  <VersionFooter />
56
58
  </View>
@@ -90,8 +92,6 @@ const useStyles = () => {
90
92
  flex: 1,
91
93
  },
92
94
  footer: {
93
- flex: 1,
94
- justifyContent: 'flex-end',
95
95
  paddingBottom: Math.max(insets.bottom, 8),
96
96
  },
97
97
  sectionOuter: {
@@ -0,0 +1,15 @@
1
+ import { membershipSyncInfoText } from '../membership_sync_info_text'
2
+
3
+ describe('membershipSyncInfoText', () => {
4
+ it('explains membership sync and history visibility for a group', () => {
5
+ expect(membershipSyncInfoText('the group')).toBe(
6
+ 'This conversation will stay in sync with the group. Members will automatically be added or removed, and new members will see the history.'
7
+ )
8
+ })
9
+
10
+ it('explains membership sync and history visibility for teams', () => {
11
+ expect(membershipSyncInfoText('the teams')).toBe(
12
+ 'This conversation will stay in sync with the teams. Members will automatically be added or removed, and new members will see the history.'
13
+ )
14
+ })
15
+ })
@@ -8,6 +8,7 @@ export * from './convert_attachments_for_create'
8
8
  export * from './destructure_chat_group_graph_id'
9
9
  export * from './host_bridge'
10
10
  export * from './liquid_glass'
11
+ export * from './membership_sync_info_text'
11
12
  export * from './native_adapters'
12
13
  export * from './pluralize'
13
14
  export * from './conversation_safety_constants'
@@ -0,0 +1,3 @@
1
+ export function membershipSyncInfoText(source: string): string {
2
+ return `This conversation will stay in sync with ${source}. Members will automatically be added or removed, and new members will see the history.`
3
+ }
@@ -0,0 +1,12 @@
1
+ import { LinkingAdapter } from '../linking'
2
+
3
+ describe('LinkingAdapter', () => {
4
+ it('forwards open options to the host', async () => {
5
+ const openURL = jest.fn(async () => {})
6
+ const adapter = new LinkingAdapter({ openURL, canOpenURL: async () => true })
7
+
8
+ await adapter.openURL('https://example.com', { forceOpenInBrowser: true })
9
+
10
+ expect(openURL).toHaveBeenCalledWith('https://example.com', { forceOpenInBrowser: true })
11
+ })
12
+ })
@@ -1,10 +1,19 @@
1
1
  import { Linking } from 'react-native'
2
2
 
3
- export class LinkingAdapter {
4
- openURL: Linking['openURL']
3
+ export type LinkingOpenURLOptions = {
4
+ forceOpenInBrowser?: boolean
5
+ }
6
+
7
+ type LinkingMethods = {
8
+ openURL: (url: string, options?: LinkingOpenURLOptions) => Promise<unknown>
5
9
  canOpenURL: Linking['canOpenURL']
10
+ }
11
+
12
+ export class LinkingAdapter {
13
+ openURL: LinkingMethods['openURL']
14
+ canOpenURL: LinkingMethods['canOpenURL']
6
15
 
7
- constructor(methods: Pick<Linking, 'openURL' | 'canOpenURL'>) {
16
+ constructor(methods: LinkingMethods) {
8
17
  this.openURL = methods.openURL.bind(Linking)
9
18
  this.canOpenURL = methods.canOpenURL.bind(Linking)
10
19
  }