@planningcenter/chat-react-native 4.7.1-qa-staging.8 → 4.7.1-qa-1119.0
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/components/conversations/bulk_conversation_actions_bar.d.ts +2 -0
- package/build/components/conversations/bulk_conversation_actions_bar.d.ts.map +1 -0
- package/build/components/conversations/bulk_conversation_actions_bar.js +215 -0
- package/build/components/conversations/bulk_conversation_actions_bar.js.map +1 -0
- package/build/components/conversations/conversation_actions.d.ts +2 -1
- package/build/components/conversations/conversation_actions.d.ts.map +1 -1
- package/build/components/conversations/conversation_actions.js +173 -130
- package/build/components/conversations/conversation_actions.js.map +1 -1
- package/build/components/conversations/conversation_preview.d.ts.map +1 -1
- package/build/components/conversations/conversation_preview.js +168 -110
- package/build/components/conversations/conversation_preview.js.map +1 -1
- package/build/components/conversations/conversations.d.ts.map +1 -1
- package/build/components/conversations/conversations.js +50 -48
- package/build/components/conversations/conversations.js.map +1 -1
- package/build/components/display/checkbox.d.ts +8 -0
- package/build/components/display/checkbox.d.ts.map +1 -0
- package/build/components/display/checkbox.js +87 -0
- package/build/components/display/checkbox.js.map +1 -0
- package/build/components/display/icon.d.ts +3 -1
- package/build/components/display/icon.d.ts.map +1 -1
- package/build/components/display/icon.js +2 -0
- package/build/components/display/icon.js.map +1 -1
- package/build/components/display/index.d.ts +1 -0
- package/build/components/display/index.d.ts.map +1 -1
- package/build/components/display/index.js +1 -0
- package/build/components/display/index.js.map +1 -1
- package/build/contexts/api_provider.d.ts.map +1 -1
- package/build/contexts/api_provider.js +2 -0
- package/build/contexts/api_provider.js.map +1 -1
- package/build/contexts/conversations_context.d.ts +5 -0
- package/build/contexts/conversations_context.d.ts.map +1 -1
- package/build/contexts/conversations_context.js +121 -32
- package/build/contexts/conversations_context.js.map +1 -1
- package/build/contexts/session_context.d.ts +0 -1
- package/build/contexts/session_context.d.ts.map +1 -1
- package/build/contexts/session_context.js +3 -0
- package/build/contexts/session_context.js.map +1 -1
- package/build/hooks/use_bulk_conversation_actions.d.ts +8 -0
- package/build/hooks/use_bulk_conversation_actions.d.ts.map +1 -0
- package/build/hooks/use_bulk_conversation_actions.js +309 -0
- package/build/hooks/use_bulk_conversation_actions.js.map +1 -0
- package/build/hooks/use_conversation_jolt_events.d.ts.map +1 -1
- package/build/hooks/use_conversation_jolt_events.js +3 -2
- package/build/hooks/use_conversation_jolt_events.js.map +1 -1
- package/build/hooks/use_conversations_actions.d.ts +9 -9
- package/build/hooks/use_conversations_actions.d.ts.map +1 -1
- package/build/hooks/use_conversations_actions.js +12 -7
- package/build/hooks/use_conversations_actions.js.map +1 -1
- package/build/hooks/use_conversations_cache.d.ts +15 -5
- package/build/hooks/use_conversations_cache.d.ts.map +1 -1
- package/build/hooks/use_conversations_cache.js +170 -122
- package/build/hooks/use_conversations_cache.js.map +1 -1
- package/build/hooks/use_conversations_jolt_events.d.ts.map +1 -1
- package/build/hooks/use_conversations_jolt_events.js +47 -20
- package/build/hooks/use_conversations_jolt_events.js.map +1 -1
- package/build/hooks/use_mark_latest_message_read.d.ts.map +1 -1
- package/build/hooks/use_mark_latest_message_read.js +5 -4
- package/build/hooks/use_mark_latest_message_read.js.map +1 -1
- package/build/navigation/index.d.ts.map +1 -1
- package/build/navigation/index.js +5 -7
- package/build/navigation/index.js.map +1 -1
- package/build/screens/conversation_actions_screen.d.ts +2 -0
- package/build/screens/conversation_actions_screen.d.ts.map +1 -1
- package/build/screens/conversation_actions_screen.js +380 -46
- package/build/screens/conversation_actions_screen.js.map +1 -1
- package/build/screens/conversation_filter_recipients/components/checkbox_row.d.ts.map +1 -1
- package/build/screens/conversation_filter_recipients/components/checkbox_row.js +9 -64
- package/build/screens/conversation_filter_recipients/components/checkbox_row.js.map +1 -1
- package/build/screens/conversations/conversations_screen.d.ts +5 -0
- package/build/screens/conversations/conversations_screen.d.ts.map +1 -1
- package/build/screens/conversations/conversations_screen.js +156 -31
- package/build/screens/conversations/conversations_screen.js.map +1 -1
- package/build/types/jolt_events/index.d.ts +2 -0
- package/build/types/jolt_events/index.d.ts.map +1 -1
- package/build/types/jolt_events/index.js.map +1 -1
- package/build/types/jolt_events/person_events.d.ts +9 -0
- package/build/types/jolt_events/person_events.d.ts.map +1 -0
- package/build/types/jolt_events/person_events.js +2 -0
- package/build/types/jolt_events/person_events.js.map +1 -0
- package/build/utils/jolt/parse_stream_user_event_type.d.ts +3 -0
- package/build/utils/jolt/parse_stream_user_event_type.d.ts.map +1 -0
- package/build/utils/jolt/parse_stream_user_event_type.js +9 -0
- package/build/utils/jolt/parse_stream_user_event_type.js.map +1 -0
- package/build/utils/native_adapters/configuration.d.ts +3 -0
- package/build/utils/native_adapters/configuration.d.ts.map +1 -1
- package/build/utils/native_adapters/configuration.js +3 -0
- package/build/utils/native_adapters/configuration.js.map +1 -1
- package/build/utils/native_adapters/index.d.ts +1 -0
- package/build/utils/native_adapters/index.d.ts.map +1 -1
- package/build/utils/native_adapters/index.js +1 -0
- package/build/utils/native_adapters/index.js.map +1 -1
- package/build/utils/native_adapters/updates.d.ts +11 -0
- package/build/utils/native_adapters/updates.d.ts.map +1 -0
- package/build/utils/native_adapters/updates.js +8 -0
- package/build/utils/native_adapters/updates.js.map +1 -0
- package/build/utils/throttled_refresh.d.ts +7 -0
- package/build/utils/throttled_refresh.d.ts.map +1 -0
- package/build/utils/throttled_refresh.js +42 -0
- package/build/utils/throttled_refresh.js.map +1 -0
- package/package.json +3 -3
- package/src/__tests__/contexts/session_context.tsx +19 -39
- package/src/__tests__/hooks/useTheme.tsx +0 -7
- package/src/__tests__/hooks/use_async_storage.test.tsx +1 -87
- package/src/__tests__/hooks/use_attachment_uploader.test.tsx +0 -11
- package/src/__tests__/hooks/use_font_scale.test.ts +0 -25
- package/src/__tests__/utils/cache/page_mutations.ts +3 -68
- package/src/__tests__/utils/client.ts +6 -15
- package/src/__tests__/utils/native_adapters/configuration.ts +15 -50
- package/src/__tests__/utils/parse_simple_markdown.ts +0 -6
- package/src/__tests__/utils/session.ts +0 -11
- package/src/__tests__/utils/theme.ts +0 -17
- package/src/components/conversations/__tests__/bulk_conversation_actions_bar.test.tsx +95 -0
- package/src/components/conversations/__tests__/conversation_actions.test.tsx +35 -3
- package/src/components/conversations/__tests__/conversation_preview.test.tsx +69 -3
- package/src/components/conversations/__tests__/conversations.test.tsx +4 -1
- package/src/components/conversations/bulk_conversation_actions_bar.tsx +140 -0
- package/src/components/conversations/conversation_actions.tsx +17 -9
- package/src/components/conversations/conversation_preview.tsx +20 -2
- package/src/components/conversations/conversations.tsx +2 -1
- package/src/components/display/__tests__/filter_dropdown.test.tsx +1 -19
- package/src/components/display/__tests__/icon_tile.test.tsx +24 -7
- package/src/components/display/checkbox.tsx +47 -0
- package/src/components/display/icon.tsx +3 -0
- package/src/components/display/index.ts +1 -0
- package/src/components/page/__tests__/component_error_boundary.test.tsx +0 -12
- package/src/contexts/__tests__/conversations_context.test.tsx +86 -0
- package/src/contexts/api_provider.tsx +2 -0
- package/src/contexts/conversations_context.tsx +69 -2
- package/src/contexts/session_context.tsx +3 -1
- package/src/hooks/__tests__/jolt_refresh_throttling.test.tsx +194 -0
- package/src/hooks/__tests__/use_bulk_conversation_actions.test.tsx +119 -0
- package/src/hooks/__tests__/use_conversations_jolt_events.test.tsx +1 -0
- package/src/hooks/__tests__/use_conversations_mark_read.test.tsx +38 -12
- package/src/hooks/__tests__/use_hide_conversation.test.tsx +15 -3
- package/src/hooks/__tests__/use_mark_latest_message_read.test.tsx +23 -2
- package/src/hooks/use_bulk_conversation_actions.ts +173 -0
- package/src/hooks/use_conversation_jolt_events.ts +2 -1
- package/src/hooks/use_conversations_actions.ts +7 -4
- package/src/hooks/use_conversations_cache.ts +33 -26
- package/src/hooks/use_conversations_jolt_events.ts +24 -10
- package/src/hooks/use_mark_latest_message_read.ts +6 -5
- package/src/navigation/index.tsx +8 -8
- package/src/screens/__tests__/conversation_actions_screen.test.tsx +48 -6
- package/src/screens/__tests__/conversation_details_screen.test.tsx +0 -19
- package/src/screens/avatar_picker/__tests__/avatar_picker_state.test.ts +0 -14
- package/src/screens/conversation_actions_screen.tsx +145 -12
- package/src/screens/conversation_filter_recipients/components/checkbox_row.tsx +3 -35
- package/src/screens/conversations/__tests__/conversations_screen.test.tsx +35 -9
- package/src/screens/conversations/components/__tests__/filter_dropdown_list_header_component.test.tsx +0 -8
- package/src/screens/conversations/components/__tests__/search_list_header_component.test.tsx +0 -10
- package/src/screens/conversations/conversations_screen.tsx +67 -3
- package/src/screens/search/components/__tests__/search_results_list.test.tsx +1 -0
- package/src/types/jolt_events/index.ts +2 -0
- package/src/types/jolt_events/person_events.ts +16 -0
- package/src/utils/__tests__/attachment_kind.test.ts +0 -4
- package/src/utils/__tests__/convert_attachments_for_create.test.ts +0 -28
- package/src/utils/__tests__/is_input_editable.test.ts +1 -2
- package/src/utils/__tests__/message_text.test.ts +0 -5
- package/src/utils/__tests__/session_manager.test.ts +0 -83
- package/src/utils/__tests__/sha_256.test.ts +0 -34
- package/src/utils/__tests__/throttled_refresh.test.ts +101 -0
- package/src/utils/__tests__/uri.test.ts +51 -0
- package/src/utils/jolt/__tests__/parse_stream_user_event_type.test.ts +27 -0
- package/src/utils/jolt/parse_stream_user_event_type.ts +16 -0
- package/src/utils/native_adapters/configuration.ts +5 -0
- package/src/utils/native_adapters/index.ts +1 -0
- package/src/utils/native_adapters/updates.ts +16 -0
- package/src/utils/throttled_refresh.ts +62 -0
- package/src/__tests__/event-polyfill.test.ts +0 -313
- package/src/__tests__/index.tsx +0 -5
- package/src/__tests__/jest.ts +0 -11
- package/src/__tests__/utils/uri.ts +0 -65
- package/src/components/display/__tests__/version_footer.test.tsx +0 -48
- package/src/screens/search/components/__tests__/search_blank_states.test.tsx +0 -20
- package/src/utils/__tests__/membership_sync_info_text.test.ts +0 -15
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
useFontScale,
|
|
8
8
|
useScalableNumberOfLines,
|
|
9
9
|
} from '../../hooks'
|
|
10
|
+
import { useSelectedChipBackgroundColor } from '../../hooks/use_selected_chip_background_color'
|
|
10
11
|
import { ConversationPreviewData, ConversationResource } from '../../types'
|
|
11
12
|
import { REACTION_EMOJIS, isArchivedConversation, platformFontWeightBold } from '../../utils'
|
|
12
13
|
import { formatDatePreview } from '../../utils/date'
|
|
@@ -19,6 +20,7 @@ import {
|
|
|
19
20
|
IconTile,
|
|
20
21
|
Text,
|
|
21
22
|
Badge,
|
|
23
|
+
Checkbox,
|
|
22
24
|
type BadgeProps,
|
|
23
25
|
} from '../display'
|
|
24
26
|
import { ConversationActions } from './conversation_actions'
|
|
@@ -44,8 +46,12 @@ export const ConversationPreview = ({
|
|
|
44
46
|
const styles = useStyles()
|
|
45
47
|
const {
|
|
46
48
|
args: { show_hidden: hidden = false },
|
|
49
|
+
selectMode,
|
|
50
|
+
selectedIds,
|
|
51
|
+
toggleSelected,
|
|
47
52
|
} = useConversationsContext()
|
|
48
53
|
const {
|
|
54
|
+
id,
|
|
49
55
|
conversationPreview,
|
|
50
56
|
lastMessageCreatedAt,
|
|
51
57
|
title,
|
|
@@ -61,6 +67,8 @@ export const ConversationPreview = ({
|
|
|
61
67
|
const fallbackIconName = emptyConversation ? 'people.noTextMessage' : 'general.person'
|
|
62
68
|
const hasMetaContent = lastMessageCreatedAt || unreadCount > 0 || muted || hidden
|
|
63
69
|
const isUnread = unreadCount > 0 || unreadReaction
|
|
70
|
+
const selected = selectMode ? selectedIds.includes(id) : undefined
|
|
71
|
+
const selectedBackgroundColor = useSelectedChipBackgroundColor()
|
|
64
72
|
|
|
65
73
|
const numberOfLinesScaledTitle = useScalableNumberOfLines(1)
|
|
66
74
|
const numberOfLinesScaledPreviewText = useScalableNumberOfLines(2)
|
|
@@ -79,10 +87,17 @@ export const ConversationPreview = ({
|
|
|
79
87
|
return (
|
|
80
88
|
<ConversationActions
|
|
81
89
|
conversation={conversation}
|
|
82
|
-
style={[
|
|
83
|
-
|
|
90
|
+
style={[
|
|
91
|
+
styles.previewRow,
|
|
92
|
+
disabled && !archived && styles.disabled,
|
|
93
|
+
selected && { backgroundColor: selectedBackgroundColor },
|
|
94
|
+
style,
|
|
95
|
+
]}
|
|
96
|
+
onPress={selectMode ? () => toggleSelected(id) : onPress}
|
|
84
97
|
accessibilityLabel={conversationAccessibilityLabel}
|
|
98
|
+
selected={selected}
|
|
85
99
|
>
|
|
100
|
+
{selected !== undefined && <Checkbox checked={selected} style={styles.checkbox} />}
|
|
86
101
|
{archived ? (
|
|
87
102
|
<IconTile
|
|
88
103
|
icon={faBoxArchive}
|
|
@@ -284,6 +299,9 @@ const useStyles = () => {
|
|
|
284
299
|
disabled: {
|
|
285
300
|
opacity: 0.4,
|
|
286
301
|
},
|
|
302
|
+
checkbox: {
|
|
303
|
+
alignSelf: 'center',
|
|
304
|
+
},
|
|
287
305
|
title: {
|
|
288
306
|
fontSize: 16,
|
|
289
307
|
color: colors.textColorDefaultPrimary,
|
|
@@ -32,6 +32,7 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
|
|
|
32
32
|
isRefetching,
|
|
33
33
|
isFetched,
|
|
34
34
|
hasNextPage,
|
|
35
|
+
selectMode,
|
|
35
36
|
args: {
|
|
36
37
|
chat_group_graph_id,
|
|
37
38
|
group_source_app_name,
|
|
@@ -88,7 +89,7 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
|
|
|
88
89
|
contentInsetAdjustmentBehavior="automatic"
|
|
89
90
|
onRefresh={refetch}
|
|
90
91
|
refreshing={!isFetched && isRefetching}
|
|
91
|
-
ListHeaderComponent={ListHeaderComponent}
|
|
92
|
+
ListHeaderComponent={selectMode ? null : ListHeaderComponent}
|
|
92
93
|
ListEmptyComponent={
|
|
93
94
|
<ConversationsBlankState
|
|
94
95
|
isFilterApplied={isFilterApplied}
|
|
@@ -62,7 +62,7 @@ const options = [
|
|
|
62
62
|
{ id: 'teams', label: 'Teams' },
|
|
63
63
|
]
|
|
64
64
|
|
|
65
|
-
const renderFilterDropdown = (
|
|
65
|
+
const renderFilterDropdown = () => {
|
|
66
66
|
const onSelect = jest.fn()
|
|
67
67
|
const onMoreFilters = jest.fn()
|
|
68
68
|
|
|
@@ -73,7 +73,6 @@ const renderFilterDropdown = ({ showMoreFilters }: { showMoreFilters?: boolean }
|
|
|
73
73
|
onSelect={onSelect}
|
|
74
74
|
onMoreFilters={onMoreFilters}
|
|
75
75
|
triggerLabel="Groups"
|
|
76
|
-
showMoreFilters={showMoreFilters}
|
|
77
76
|
/>
|
|
78
77
|
)
|
|
79
78
|
|
|
@@ -81,16 +80,6 @@ const renderFilterDropdown = ({ showMoreFilters }: { showMoreFilters?: boolean }
|
|
|
81
80
|
}
|
|
82
81
|
|
|
83
82
|
describe('FilterDropdown', () => {
|
|
84
|
-
it('hands the menu every option, the selected one checked, then More filters', () => {
|
|
85
|
-
renderFilterDropdown()
|
|
86
|
-
|
|
87
|
-
expect(screen.getByRole('button', { name: 'Groups' })).toBeTruthy()
|
|
88
|
-
expect(
|
|
89
|
-
screen.getAllByRole('menuitem').map(item => [item.props.accessibilityState.selected])
|
|
90
|
-
).toEqual([[false], [true], [false], [false]])
|
|
91
|
-
expect(screen.getByRole('menuitem', { name: 'More filters' })).toBeTruthy()
|
|
92
|
-
})
|
|
93
|
-
|
|
94
83
|
it('calls onSelect with the id of the pressed option', () => {
|
|
95
84
|
const { onSelect, onMoreFilters } = renderFilterDropdown()
|
|
96
85
|
|
|
@@ -100,13 +89,6 @@ describe('FilterDropdown', () => {
|
|
|
100
89
|
expect(onMoreFilters).not.toHaveBeenCalled()
|
|
101
90
|
})
|
|
102
91
|
|
|
103
|
-
it('leaves More filters out when showMoreFilters is false', () => {
|
|
104
|
-
renderFilterDropdown({ showMoreFilters: false })
|
|
105
|
-
|
|
106
|
-
expect(screen.queryByRole('menuitem', { name: 'More filters' })).toBeNull()
|
|
107
|
-
expect(screen.getAllByRole('menuitem')).toHaveLength(options.length)
|
|
108
|
-
})
|
|
109
|
-
|
|
110
92
|
it('calls onMoreFilters for the More filters action', () => {
|
|
111
93
|
const { onSelect, onMoreFilters } = renderFilterDropdown()
|
|
112
94
|
|
|
@@ -1,16 +1,33 @@
|
|
|
1
1
|
import { render } from '@testing-library/react-native'
|
|
2
2
|
import React from 'react'
|
|
3
|
+
import { StyleSheet } from 'react-native'
|
|
3
4
|
import { faBoxArchive } from '../../../vendor/font_awesome_pro_solid_icons'
|
|
4
5
|
import { IconTile } from '../icon_tile'
|
|
5
6
|
|
|
7
|
+
const clippingAncestors = (shape: 'circle' | 'square') => {
|
|
8
|
+
const view = render(
|
|
9
|
+
<IconTile icon={faBoxArchive} shape={shape} maxFontSizeMultiplier={1} testID="tile" />
|
|
10
|
+
)
|
|
11
|
+
const ancestors = []
|
|
12
|
+
let node = view.getByTestId('tile', { includeHiddenElements: true }).parent
|
|
13
|
+
while (node) {
|
|
14
|
+
ancestors.push(node)
|
|
15
|
+
node = node.parent
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
return ancestors.filter(
|
|
19
|
+
ancestor =>
|
|
20
|
+
typeof ancestor.type === 'string' &&
|
|
21
|
+
StyleSheet.flatten(ancestor.props.style)?.overflow === 'hidden'
|
|
22
|
+
)
|
|
23
|
+
}
|
|
24
|
+
|
|
6
25
|
describe('IconTile', () => {
|
|
7
|
-
it('
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
)
|
|
26
|
+
it('masks a circle tile', () => {
|
|
27
|
+
expect(clippingAncestors('circle')).not.toHaveLength(0)
|
|
28
|
+
})
|
|
11
29
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
})
|
|
30
|
+
it('keeps a square tile out of the circular mask', () => {
|
|
31
|
+
expect(clippingAncestors('square')).toHaveLength(0)
|
|
15
32
|
})
|
|
16
33
|
})
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
|
|
3
|
+
import { useTheme } from '../../hooks'
|
|
4
|
+
import { tokens } from '../../vendor/tapestry/tokens'
|
|
5
|
+
import { Icon } from './icon'
|
|
6
|
+
|
|
7
|
+
interface CheckboxProps {
|
|
8
|
+
checked: boolean
|
|
9
|
+
style?: StyleProp<ViewStyle>
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export function Checkbox({ checked, style }: CheckboxProps) {
|
|
13
|
+
const styles = useStyles()
|
|
14
|
+
|
|
15
|
+
return (
|
|
16
|
+
<View style={[checked ? styles.checkedContainer : styles.uncheckedContainer, style]}>
|
|
17
|
+
{checked && <Icon name="general.thickCheckmark" style={styles.checkedIcon} />}
|
|
18
|
+
</View>
|
|
19
|
+
)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const useStyles = () => {
|
|
23
|
+
const { colors } = useTheme()
|
|
24
|
+
|
|
25
|
+
const baseCheckboxStyles: ViewStyle = {
|
|
26
|
+
width: 20,
|
|
27
|
+
height: 20,
|
|
28
|
+
borderRadius: 40,
|
|
29
|
+
alignItems: 'center',
|
|
30
|
+
justifyContent: 'center',
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
return StyleSheet.create({
|
|
34
|
+
checkedContainer: {
|
|
35
|
+
...baseCheckboxStyles,
|
|
36
|
+
backgroundColor: colors.statusSuccessIcon,
|
|
37
|
+
},
|
|
38
|
+
uncheckedContainer: {
|
|
39
|
+
...baseCheckboxStyles,
|
|
40
|
+
borderWidth: 2,
|
|
41
|
+
borderColor: colors.borderColorDefaultDarker,
|
|
42
|
+
},
|
|
43
|
+
checkedIcon: {
|
|
44
|
+
color: tokens.colorNeutral100White,
|
|
45
|
+
},
|
|
46
|
+
})
|
|
47
|
+
}
|
|
@@ -3,6 +3,7 @@ import * as api from '@planningcenter/icons/paths/api'
|
|
|
3
3
|
import * as brand from '@planningcenter/icons/paths/brand'
|
|
4
4
|
import * as calendar from '@planningcenter/icons/paths/calendar'
|
|
5
5
|
import * as chat from '@planningcenter/icons/paths/chat'
|
|
6
|
+
import * as checkIns from '@planningcenter/icons/paths/check-ins'
|
|
6
7
|
import * as churchCenter from '@planningcenter/icons/paths/church-center'
|
|
7
8
|
import * as general from '@planningcenter/icons/paths/general'
|
|
8
9
|
import * as groups from '@planningcenter/icons/paths/groups'
|
|
@@ -30,6 +31,7 @@ const ICONS = {
|
|
|
30
31
|
brand,
|
|
31
32
|
calendar,
|
|
32
33
|
chat,
|
|
34
|
+
checkIns,
|
|
33
35
|
churchCenter,
|
|
34
36
|
general,
|
|
35
37
|
groups,
|
|
@@ -55,6 +57,7 @@ export type IconString =
|
|
|
55
57
|
| `brand.${IconName<'brand'>}`
|
|
56
58
|
| `calendar.${IconName<'calendar'>}`
|
|
57
59
|
| `chat.${IconName<'chat'>}`
|
|
60
|
+
| `checkIns.${IconName<'checkIns'>}`
|
|
58
61
|
| `churchCenter.${IconName<'churchCenter'>}`
|
|
59
62
|
| `general.${IconName<'general'>}`
|
|
60
63
|
| `groups.${IconName<'groups'>}`
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { render } from '@testing-library/react-native'
|
|
2
2
|
import React from 'react'
|
|
3
|
-
import { Text } from 'react-native'
|
|
4
3
|
import { Log } from '../../../utils/native_adapters/configuration'
|
|
5
4
|
import { ComponentErrorBoundary } from '../component_error_boundary'
|
|
6
5
|
|
|
@@ -32,15 +31,4 @@ describe('ComponentErrorBoundary', () => {
|
|
|
32
31
|
expect(toJSON()).toBeNull()
|
|
33
32
|
expect(reportError.mock.calls[0][1]).toMatchObject({ scope: 'component' })
|
|
34
33
|
})
|
|
35
|
-
|
|
36
|
-
it('lets callers override the defaults', () => {
|
|
37
|
-
const { getByText } = render(
|
|
38
|
-
<ComponentErrorBoundary scope="screen" fallback={<Text>overridden</Text>}>
|
|
39
|
-
<Boom thrown={new Error('boom')} />
|
|
40
|
-
</ComponentErrorBoundary>
|
|
41
|
-
)
|
|
42
|
-
|
|
43
|
-
expect(getByText('overridden')).toBeTruthy()
|
|
44
|
-
expect(reportError.mock.calls[0][1]).toMatchObject({ scope: 'screen' })
|
|
45
|
-
})
|
|
46
34
|
})
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { act, renderHook } from '@testing-library/react-native'
|
|
2
|
+
import React from 'react'
|
|
3
|
+
import { ConversationFiltersParams } from '../../screens/conversation_filters/screen_props'
|
|
4
|
+
import { ConversationsContextProvider, useConversationsContext } from '../conversations_context'
|
|
5
|
+
|
|
6
|
+
let mockHideEnabled = true
|
|
7
|
+
jest.mock('../../hooks/use_hide_conversations_enabled', () => ({
|
|
8
|
+
useHideConversationsEnabled: () => mockHideEnabled,
|
|
9
|
+
}))
|
|
10
|
+
jest.mock('../../hooks/use_conversations', () => ({
|
|
11
|
+
useConversations: () => ({ conversations: [] }),
|
|
12
|
+
}))
|
|
13
|
+
|
|
14
|
+
let mockArgs: ConversationFiltersParams = {}
|
|
15
|
+
|
|
16
|
+
const renderContext = () =>
|
|
17
|
+
renderHook(() => useConversationsContext(), {
|
|
18
|
+
wrapper: ({ children }: { children: React.ReactNode }) => (
|
|
19
|
+
<ConversationsContextProvider args={mockArgs}>{children}</ConversationsContextProvider>
|
|
20
|
+
),
|
|
21
|
+
})
|
|
22
|
+
|
|
23
|
+
describe('ConversationsContextProvider selection', () => {
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
mockHideEnabled = true
|
|
26
|
+
mockArgs = {}
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
it('toggles conversations in and out of the selection', () => {
|
|
30
|
+
const { result } = renderContext()
|
|
31
|
+
|
|
32
|
+
act(() => result.current.enterSelectMode(1))
|
|
33
|
+
act(() => result.current.toggleSelected(2))
|
|
34
|
+
|
|
35
|
+
expect(result.current.selectMode).toBe(true)
|
|
36
|
+
expect(result.current.selectedIds).toEqual([1, 2])
|
|
37
|
+
|
|
38
|
+
act(() => result.current.toggleSelected(1))
|
|
39
|
+
|
|
40
|
+
expect(result.current.selectedIds).toEqual([2])
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
it('leaves select mode on clear', () => {
|
|
44
|
+
const { result } = renderContext()
|
|
45
|
+
|
|
46
|
+
act(() => result.current.enterSelectMode(1))
|
|
47
|
+
act(() => result.current.clearSelection())
|
|
48
|
+
|
|
49
|
+
expect(result.current.selectMode).toBe(false)
|
|
50
|
+
expect(result.current.selectedIds).toEqual([])
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
it('clears the selection when the filter changes', () => {
|
|
54
|
+
const { result, rerender } = renderContext()
|
|
55
|
+
|
|
56
|
+
act(() => result.current.enterSelectMode(1))
|
|
57
|
+
mockArgs = { show_unread: true }
|
|
58
|
+
rerender({})
|
|
59
|
+
|
|
60
|
+
expect(result.current.selectMode).toBe(false)
|
|
61
|
+
expect(result.current.selectedIds).toEqual([])
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
it('stays out of select mode when the flag is off', () => {
|
|
65
|
+
mockHideEnabled = false
|
|
66
|
+
const { result } = renderContext()
|
|
67
|
+
|
|
68
|
+
act(() => result.current.enterSelectMode(1))
|
|
69
|
+
|
|
70
|
+
expect(result.current.selectMode).toBe(false)
|
|
71
|
+
expect(result.current.selectedIds).toEqual([])
|
|
72
|
+
})
|
|
73
|
+
|
|
74
|
+
it('does not revive the selection when the flag flips off and back on', () => {
|
|
75
|
+
const { result, rerender } = renderContext()
|
|
76
|
+
|
|
77
|
+
act(() => result.current.enterSelectMode(1))
|
|
78
|
+
mockHideEnabled = false
|
|
79
|
+
rerender({})
|
|
80
|
+
mockHideEnabled = true
|
|
81
|
+
rerender({})
|
|
82
|
+
|
|
83
|
+
expect(result.current.selectMode).toBe(false)
|
|
84
|
+
expect(result.current.selectedIds).toEqual([])
|
|
85
|
+
})
|
|
86
|
+
})
|
|
@@ -15,6 +15,7 @@ import { useJoltForegroundPing } from '../hooks/use_jolt'
|
|
|
15
15
|
import { RequestQueryKey } from '../hooks/use_suspense_api'
|
|
16
16
|
import { emitAuthRefresh } from '../utils/auth_events'
|
|
17
17
|
import { isResponseLike, ResponseError } from '../utils/response_error'
|
|
18
|
+
import { cancelThrottledRefreshes } from '../utils/throttled_refresh'
|
|
18
19
|
import { ChatContext, ChatContextValue } from './chat_context'
|
|
19
20
|
|
|
20
21
|
let apiClient: ApiClient | undefined
|
|
@@ -65,6 +66,7 @@ export function ApiProvider({ children }: ViewProps) {
|
|
|
65
66
|
if (!sessionChanged) return
|
|
66
67
|
|
|
67
68
|
emitAuthRefresh()
|
|
69
|
+
cancelThrottledRefreshes(chatQueryClient)
|
|
68
70
|
|
|
69
71
|
if (chatQueryClient.isFetching()) {
|
|
70
72
|
chatQueryClient.cancelQueries().then(() => chatQueryClient.invalidateQueries())
|
|
@@ -3,9 +3,18 @@ import {
|
|
|
3
3
|
InfiniteQueryObserverResult,
|
|
4
4
|
InfiniteData,
|
|
5
5
|
} from '@tanstack/react-query'
|
|
6
|
-
import React, {
|
|
6
|
+
import React, {
|
|
7
|
+
createContext,
|
|
8
|
+
PropsWithChildren,
|
|
9
|
+
useCallback,
|
|
10
|
+
useContext,
|
|
11
|
+
useEffect,
|
|
12
|
+
useMemo,
|
|
13
|
+
useState,
|
|
14
|
+
} from 'react'
|
|
7
15
|
import { ApiGetQueryOptions } from '../hooks'
|
|
8
16
|
import { useConversations, UseConversationsValue } from '../hooks/use_conversations'
|
|
17
|
+
import { useHideConversationsEnabled } from '../hooks/use_hide_conversations_enabled'
|
|
9
18
|
import { ConversationFiltersParams } from '../screens/conversation_filters/screen_props'
|
|
10
19
|
import { ApiCollection, ConversationResource } from '../types'
|
|
11
20
|
import { ResponseError } from '../utils/response_error'
|
|
@@ -15,6 +24,11 @@ interface ConversationsContextValue extends UseConversationsValue {
|
|
|
15
24
|
setActiveConversationId: (_id: number) => void
|
|
16
25
|
args: ConversationFiltersParams
|
|
17
26
|
hideable: boolean
|
|
27
|
+
selectMode: boolean
|
|
28
|
+
selectedIds: number[]
|
|
29
|
+
enterSelectMode: (_id?: number) => void
|
|
30
|
+
toggleSelected: (_id: number) => void
|
|
31
|
+
clearSelection: () => void
|
|
18
32
|
}
|
|
19
33
|
|
|
20
34
|
const defaultQueryValue: UseConversationsValue = {
|
|
@@ -35,6 +49,11 @@ const ConversationsContext = createContext<ConversationsContextValue>({
|
|
|
35
49
|
activeConversationId: undefined,
|
|
36
50
|
setActiveConversationId: () => {},
|
|
37
51
|
hideable: true,
|
|
52
|
+
selectMode: false,
|
|
53
|
+
selectedIds: [],
|
|
54
|
+
enterSelectMode: () => {},
|
|
55
|
+
toggleSelected: () => {},
|
|
56
|
+
clearSelection: () => {},
|
|
38
57
|
...defaultQueryValue,
|
|
39
58
|
})
|
|
40
59
|
|
|
@@ -49,6 +68,10 @@ export const ConversationsContextProvider = ({
|
|
|
49
68
|
hideable?: boolean
|
|
50
69
|
}>) => {
|
|
51
70
|
const [activeConversationId, setActiveConversationId] = useState<number | undefined>()
|
|
71
|
+
const hideConversationsEnabled = useHideConversationsEnabled()
|
|
72
|
+
const [selecting, setSelecting] = useState(false)
|
|
73
|
+
const [selectedIds, setSelectedIds] = useState<number[]>([])
|
|
74
|
+
const selectMode = hideConversationsEnabled && selecting
|
|
52
75
|
const {
|
|
53
76
|
chat_group_graph_id,
|
|
54
77
|
group_source_app_name,
|
|
@@ -70,15 +93,59 @@ export const ConversationsContextProvider = ({
|
|
|
70
93
|
paginatorOptions
|
|
71
94
|
)
|
|
72
95
|
|
|
96
|
+
const enterSelectMode = useCallback((id?: number) => {
|
|
97
|
+
setSelecting(true)
|
|
98
|
+
setSelectedIds(id === undefined ? [] : [id])
|
|
99
|
+
}, [])
|
|
100
|
+
|
|
101
|
+
const toggleSelected = useCallback((id: number) => {
|
|
102
|
+
setSelectedIds(ids =>
|
|
103
|
+
ids.includes(id) ? ids.filter(selectedId => selectedId !== id) : [...ids, id]
|
|
104
|
+
)
|
|
105
|
+
}, [])
|
|
106
|
+
|
|
107
|
+
const clearSelection = useCallback(() => {
|
|
108
|
+
setSelecting(false)
|
|
109
|
+
setSelectedIds([])
|
|
110
|
+
}, [])
|
|
111
|
+
|
|
112
|
+
useEffect(() => {
|
|
113
|
+
clearSelection()
|
|
114
|
+
}, [
|
|
115
|
+
clearSelection,
|
|
116
|
+
hideConversationsEnabled,
|
|
117
|
+
chat_group_graph_id,
|
|
118
|
+
group_source_app_name,
|
|
119
|
+
show_direct_messages,
|
|
120
|
+
show_archived,
|
|
121
|
+
show_hidden,
|
|
122
|
+
show_unread,
|
|
123
|
+
])
|
|
124
|
+
|
|
73
125
|
const value = useMemo(
|
|
74
126
|
() => ({
|
|
75
127
|
args,
|
|
76
128
|
activeConversationId,
|
|
77
129
|
setActiveConversationId,
|
|
78
130
|
hideable,
|
|
131
|
+
selectMode,
|
|
132
|
+
selectedIds: selectMode ? selectedIds : [],
|
|
133
|
+
enterSelectMode,
|
|
134
|
+
toggleSelected,
|
|
135
|
+
clearSelection,
|
|
79
136
|
...query,
|
|
80
137
|
}),
|
|
81
|
-
[
|
|
138
|
+
[
|
|
139
|
+
args,
|
|
140
|
+
activeConversationId,
|
|
141
|
+
hideable,
|
|
142
|
+
selectMode,
|
|
143
|
+
selectedIds,
|
|
144
|
+
enterSelectMode,
|
|
145
|
+
toggleSelected,
|
|
146
|
+
clearSelection,
|
|
147
|
+
query,
|
|
148
|
+
]
|
|
82
149
|
)
|
|
83
150
|
|
|
84
151
|
return <ConversationsContext.Provider value={value}>{children}</ConversationsContext.Provider>
|
|
@@ -17,6 +17,7 @@ import { ApiResource } from '../types/api_primitives'
|
|
|
17
17
|
import { ENV, PartialToken, Session, UNAUTHENTICATED_SESSION_ID } from '../utils'
|
|
18
18
|
import { StorageAdapter } from '../utils/native_adapters/storage_adapter'
|
|
19
19
|
import { SessionManager } from '../utils/session_manager'
|
|
20
|
+
import { cancelThrottledRefreshes } from '../utils/throttled_refresh'
|
|
20
21
|
import { chatQueryClient } from './api_provider'
|
|
21
22
|
|
|
22
23
|
type Sessions = Record<string, string> // Key is session ID
|
|
@@ -70,7 +71,6 @@ export type SessionContextConfig = {
|
|
|
70
71
|
retryText?: string
|
|
71
72
|
logoutText?: string
|
|
72
73
|
}
|
|
73
|
-
defaultEnv?: ENV
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
const decorateSession = async <T extends PartialToken>(session: Session<T>) => {
|
|
@@ -143,6 +143,8 @@ export function SessionContextProvider({
|
|
|
143
143
|
})
|
|
144
144
|
|
|
145
145
|
const handleClearQueryClient = useCallback(() => {
|
|
146
|
+
cancelThrottledRefreshes(chatQueryClient)
|
|
147
|
+
cancelThrottledRefreshes(queryClient)
|
|
146
148
|
chatQueryClient.clear()
|
|
147
149
|
queryClient.clear()
|
|
148
150
|
}, [queryClient])
|