@planningcenter/chat-react-native 4.7.1-qa-staging.2 → 4.7.1-qa-staging.4
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/conversation/attachments/expanded_link.js +8 -8
- package/build/components/conversation/attachments/expanded_link.js.map +1 -1
- package/build/components/conversation/attachments/generic_file_attachment.d.ts.map +1 -1
- package/build/components/conversation/attachments/generic_file_attachment.js +2 -2
- package/build/components/conversation/attachments/generic_file_attachment.js.map +1 -1
- package/build/components/conversation/attachments/giphy_attachment.d.ts.map +1 -1
- package/build/components/conversation/attachments/giphy_attachment.js +2 -2
- package/build/components/conversation/attachments/giphy_attachment.js.map +1 -1
- package/build/components/conversation/attachments/image_attachment.js +2 -2
- package/build/components/conversation/attachments/image_attachment.js.map +1 -1
- package/build/components/conversation/message_form.js +2 -2
- package/build/components/conversation/message_form.js.map +1 -1
- package/build/components/conversation/message_markdown.js +2 -2
- package/build/components/conversation/message_markdown.js.map +1 -1
- package/build/hooks/groups/use_group_chat_conversation_payload.d.ts +11 -1
- package/build/hooks/groups/use_group_chat_conversation_payload.d.ts.map +1 -1
- package/build/hooks/groups/use_group_chat_conversation_payload.js +92 -47
- package/build/hooks/groups/use_group_chat_conversation_payload.js.map +1 -1
- package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +27 -25
- package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
- package/build/hooks/groups/use_group_members_for_new_conversation.js +125 -110
- package/build/hooks/groups/use_group_members_for_new_conversation.js.map +1 -1
- package/build/hooks/groups/use_groups_conversation_create.d.ts.map +1 -1
- package/build/hooks/groups/use_groups_conversation_create.js +39 -31
- package/build/hooks/groups/use_groups_conversation_create.js.map +1 -1
- package/build/hooks/groups/use_groups_proxy.d.ts +2 -0
- package/build/hooks/groups/use_groups_proxy.d.ts.map +1 -0
- package/build/hooks/groups/use_groups_proxy.js +18 -0
- package/build/hooks/groups/use_groups_proxy.js.map +1 -0
- package/build/hooks/use_features.d.ts +1 -0
- package/build/hooks/use_features.d.ts.map +1 -1
- package/build/hooks/use_features.js +2 -1
- package/build/hooks/use_features.js.map +1 -1
- package/build/hooks/use_groups_groups.d.ts.map +1 -1
- package/build/hooks/use_groups_groups.js +25 -9
- package/build/hooks/use_groups_groups.js.map +1 -1
- package/build/hooks/use_live_relative_time.js +6 -5
- package/build/hooks/use_live_relative_time.js.map +1 -1
- package/build/hooks/use_new_conversation_from_filter.d.ts.map +1 -1
- package/build/hooks/use_new_conversation_from_filter.js +11 -1
- package/build/hooks/use_new_conversation_from_filter.js.map +1 -1
- package/build/screens/age_check/age_check_underage_screen.js +3 -3
- package/build/screens/age_check/age_check_underage_screen.js.map +1 -1
- package/build/screens/attachment_actions/attachment_actions_screen.js +2 -2
- package/build/screens/attachment_actions/attachment_actions_screen.js.map +1 -1
- package/build/screens/bug_report_screen.js +4 -4
- package/build/screens/bug_report_screen.js.map +1 -1
- package/build/screens/conversation_new/components/groups_form.d.ts.map +1 -1
- package/build/screens/conversation_new/components/groups_form.js +96 -93
- package/build/screens/conversation_new/components/groups_form.js.map +1 -1
- package/build/screens/get_help_screen.d.ts.map +1 -1
- package/build/screens/get_help_screen.js +5 -21
- package/build/screens/get_help_screen.js.map +1 -1
- package/build/types/resources/groups/groups_group_resource.d.ts +1 -1
- package/build/types/resources/groups/groups_group_resource.d.ts.map +1 -1
- package/build/types/resources/groups/groups_group_resource.js.map +1 -1
- package/build/types/resources/groups/groups_membership_resource.d.ts +11 -0
- package/build/types/resources/groups/groups_membership_resource.d.ts.map +1 -0
- package/build/types/resources/groups/groups_membership_resource.js +2 -0
- package/build/types/resources/groups/groups_membership_resource.js.map +1 -0
- package/build/types/resources/groups/index.d.ts +1 -0
- package/build/types/resources/groups/index.d.ts.map +1 -1
- package/build/types/resources/groups/index.js +1 -0
- package/build/types/resources/groups/index.js.map +1 -1
- package/build/utils/date.d.ts +1 -1
- package/build/utils/date.d.ts.map +1 -1
- package/build/utils/date.js +4 -4
- package/build/utils/date.js.map +1 -1
- package/build/utils/index.d.ts +1 -0
- package/build/utils/index.d.ts.map +1 -1
- package/build/utils/index.js +1 -0
- package/build/utils/index.js.map +1 -1
- package/build/utils/open_url.d.ts +11 -0
- package/build/utils/open_url.d.ts.map +1 -0
- package/build/utils/open_url.js +46 -0
- package/build/utils/open_url.js.map +1 -0
- package/package.json +3 -3
- package/src/__tests__/components/conversation/attachments/giphy_attachment.test.tsx +1 -1
- package/src/__tests__/hooks/use_group_chat_conversation_payload.test.tsx +31 -0
- package/src/__tests__/screens/get_help_screen.test.ts +1 -1
- package/src/components/conversation/attachments/expanded_link.tsx +4 -4
- package/src/components/conversation/attachments/generic_file_attachment.tsx +2 -5
- package/src/components/conversation/attachments/giphy_attachment.tsx +2 -4
- package/src/components/conversation/attachments/image_attachment.tsx +2 -2
- package/src/components/conversation/message_form.tsx +2 -2
- package/src/components/conversation/message_markdown.tsx +2 -2
- package/src/hooks/__tests__/use_live_relative_time.test.tsx +22 -0
- package/src/hooks/groups/use_group_chat_conversation_payload.ts +30 -12
- package/src/hooks/groups/use_group_members_for_new_conversation.ts +49 -18
- package/src/hooks/groups/use_groups_conversation_create.ts +10 -14
- package/src/hooks/groups/use_groups_proxy.ts +6 -0
- package/src/hooks/use_features.ts +1 -0
- package/src/hooks/use_groups_groups.ts +21 -16
- package/src/hooks/use_live_relative_time.ts +1 -1
- package/src/hooks/use_new_conversation_from_filter.ts +13 -5
- package/src/screens/age_check/age_check_underage_screen.tsx +3 -3
- package/src/screens/attachment_actions/attachment_actions_screen.tsx +2 -2
- package/src/screens/bug_report_screen.tsx +4 -4
- package/src/screens/conversation_new/components/groups_form.tsx +11 -9
- package/src/screens/get_help_screen.tsx +5 -19
- package/src/types/resources/groups/groups_group_resource.ts +1 -1
- package/src/types/resources/groups/groups_membership_resource.ts +10 -0
- package/src/types/resources/groups/index.ts +1 -0
- package/src/utils/__tests__/date.test.ts +10 -1
- package/src/utils/__tests__/open_url.test.ts +67 -0
- package/src/utils/date.ts +4 -4
- package/src/utils/index.ts +1 -0
- package/src/utils/open_url.ts +47 -0
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { StaticScreenProps, useNavigation } from '@react-navigation/native'
|
|
2
2
|
import { useCallback, useMemo } from 'react'
|
|
3
|
-
import {
|
|
3
|
+
import { ScrollView, StyleSheet, View } from 'react-native'
|
|
4
4
|
import { Heading, PressableRow, Text, TextInlineButton } from '../components'
|
|
5
5
|
import { useApiGet, useTheme } from '../hooks'
|
|
6
6
|
import { useAppName } from '../hooks/use_app_name'
|
|
7
7
|
import { useOrganization } from '../hooks/use_organization'
|
|
8
8
|
import { ResourceObject } from '../types'
|
|
9
|
-
import {
|
|
9
|
+
import { openUrl } from '../utils'
|
|
10
10
|
|
|
11
11
|
type GetHelpScreenRouteProps = {
|
|
12
12
|
type?: 'chat' | 'general'
|
|
@@ -65,7 +65,7 @@ export const GetHelpScreen = ({ route }: GetHelpScreenProps) => {
|
|
|
65
65
|
{appSpecificHelpUrls.map(helpUrl => (
|
|
66
66
|
<PressableRow
|
|
67
67
|
key={helpUrl.id}
|
|
68
|
-
onPress={() =>
|
|
68
|
+
onPress={() => openUrl(helpUrl.link)}
|
|
69
69
|
text={helpUrl.title}
|
|
70
70
|
isActive={true}
|
|
71
71
|
iconPath="general.newWindow"
|
|
@@ -117,27 +117,13 @@ const ContactRow = ({ email, phone }: { email?: string; phone?: string }) => {
|
|
|
117
117
|
export function sendEmail(email: string) {
|
|
118
118
|
if (!email) return
|
|
119
119
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
Linking.openURL(url).catch(() => {
|
|
123
|
-
Alert.alert('Oops', `Unable to open: ${email}`, [
|
|
124
|
-
{ text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(email) },
|
|
125
|
-
{ text: 'OK' },
|
|
126
|
-
])
|
|
127
|
-
})
|
|
120
|
+
openUrl(encodeURI(`mailto:${email}`))
|
|
128
121
|
}
|
|
129
122
|
|
|
130
123
|
export function placePhoneCall(phoneNumber: string) {
|
|
131
124
|
if (!phoneNumber) return
|
|
132
125
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
Linking.openURL(url).catch(() => {
|
|
136
|
-
Alert.alert('Oops', `Unable to open: ${phoneNumber}`, [
|
|
137
|
-
{ text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(phoneNumber) },
|
|
138
|
-
{ text: 'OK' },
|
|
139
|
-
])
|
|
140
|
-
})
|
|
126
|
+
openUrl(encodeURI(`tel:${phoneNumber}`))
|
|
141
127
|
}
|
|
142
128
|
|
|
143
129
|
const useStyles = () => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { formatEventDateTime } from '../date'
|
|
1
|
+
import { formatEventDateTime, relativeTime } from '../date'
|
|
2
2
|
|
|
3
3
|
describe('formatEventDateTime', () => {
|
|
4
4
|
beforeEach(() => {
|
|
@@ -21,3 +21,12 @@ describe('formatEventDateTime', () => {
|
|
|
21
21
|
expect(formatEventDateTime(new Date(2026, 1, 3, 14, 0))).toBe('Feb 3 at 2pm')
|
|
22
22
|
})
|
|
23
23
|
})
|
|
24
|
+
|
|
25
|
+
describe('relativeTime', () => {
|
|
26
|
+
it('measures from the given time', () => {
|
|
27
|
+
const date = '2026-11-10T11:49:00Z'
|
|
28
|
+
|
|
29
|
+
expect(relativeTime(date, '2026-11-10T12:00:00Z')).toBe('11 minutes ago')
|
|
30
|
+
expect(relativeTime(date, '2026-11-10T12:01:00Z')).toBe('12 minutes ago')
|
|
31
|
+
})
|
|
32
|
+
})
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { Alert } from 'react-native'
|
|
2
|
+
import { Clipboard, Linking, Log } from '../native_adapters'
|
|
3
|
+
import { openUrl } from '../open_url'
|
|
4
|
+
|
|
5
|
+
type AlertButton = { text?: string; onPress?: () => void }
|
|
6
|
+
|
|
7
|
+
const pressButton = (text: string) => {
|
|
8
|
+
const buttons = (Alert.alert as jest.Mock).mock.calls[0][2] as AlertButton[]
|
|
9
|
+
buttons.find(button => button.text === text)?.onPress?.()
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
describe('openUrl', () => {
|
|
13
|
+
let openURL: jest.SpyInstance
|
|
14
|
+
let setStringAsync: jest.SpyInstance
|
|
15
|
+
let reportError: jest.SpyInstance
|
|
16
|
+
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
jest.spyOn(Alert, 'alert').mockImplementation(() => {})
|
|
19
|
+
openURL = jest.spyOn(Linking, 'openURL')
|
|
20
|
+
setStringAsync = jest.spyOn(Clipboard, 'setStringAsync').mockResolvedValue()
|
|
21
|
+
reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
afterEach(() => {
|
|
25
|
+
jest.restoreAllMocks()
|
|
26
|
+
})
|
|
27
|
+
|
|
28
|
+
it('passes the url and options through to the Linking adapter', async () => {
|
|
29
|
+
openURL.mockResolvedValue(true)
|
|
30
|
+
|
|
31
|
+
await openUrl('https://youtu.be/abc', { forceOpenInBrowser: true })
|
|
32
|
+
|
|
33
|
+
expect(openURL).toHaveBeenCalledWith('https://youtu.be/abc', { forceOpenInBrowser: true })
|
|
34
|
+
expect(Alert.alert).not.toHaveBeenCalled()
|
|
35
|
+
expect(reportError).not.toHaveBeenCalled()
|
|
36
|
+
})
|
|
37
|
+
|
|
38
|
+
it('reports a failed web link instead of alerting', async () => {
|
|
39
|
+
const error = new Error('Unable to open URL')
|
|
40
|
+
openURL.mockRejectedValue(error)
|
|
41
|
+
|
|
42
|
+
await openUrl('https://youtu.be/abc')
|
|
43
|
+
|
|
44
|
+
expect(reportError).toHaveBeenCalledWith(error, { extra: { url: 'https://youtu.be/abc' } })
|
|
45
|
+
expect(Alert.alert).not.toHaveBeenCalled()
|
|
46
|
+
})
|
|
47
|
+
|
|
48
|
+
it.each([
|
|
49
|
+
['mailto', 'mailto:admin@example.com', 'admin@example.com'],
|
|
50
|
+
['encoded mailto', encodeURI('mailto:first last@example.com'), 'first last@example.com'],
|
|
51
|
+
['tel', 'tel:+1 (555) 555-0100', '+1 (555) 555-0100'],
|
|
52
|
+
])('alerts and offers to copy the bare address for a %s link', async (_name, url, address) => {
|
|
53
|
+
openURL.mockRejectedValue(new Error('No Activity found'))
|
|
54
|
+
|
|
55
|
+
await openUrl(url)
|
|
56
|
+
|
|
57
|
+
expect(Alert.alert).toHaveBeenCalledWith(
|
|
58
|
+
'Oops',
|
|
59
|
+
`Unable to open: ${address}`,
|
|
60
|
+
expect.arrayContaining([expect.objectContaining({ text: 'Copy to clipboard' })])
|
|
61
|
+
)
|
|
62
|
+
expect(reportError).not.toHaveBeenCalled()
|
|
63
|
+
|
|
64
|
+
pressButton('Copy to clipboard')
|
|
65
|
+
expect(setStringAsync).toHaveBeenCalledWith(address)
|
|
66
|
+
})
|
|
67
|
+
})
|
package/src/utils/date.ts
CHANGED
|
@@ -50,13 +50,13 @@ export function relativeDateTime(dateTimeString: string): string {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
export function relativeTime(date: DateProps): string {
|
|
54
|
-
const
|
|
53
|
+
export function relativeTime(date: DateProps, now: DateProps = Date.now()): string {
|
|
54
|
+
const current = dayjs(now)
|
|
55
55
|
const then = dayjs(date)
|
|
56
|
-
const duration = dayjs.duration(
|
|
56
|
+
const duration = dayjs.duration(current.diff(then))
|
|
57
57
|
|
|
58
58
|
if (duration.asDays() < 1) {
|
|
59
|
-
return then.
|
|
59
|
+
return then.from(current)
|
|
60
60
|
} else {
|
|
61
61
|
return dayjs(date).format('h:mma')
|
|
62
62
|
}
|
package/src/utils/index.ts
CHANGED
|
@@ -10,6 +10,7 @@ export * from './host_bridge'
|
|
|
10
10
|
export * from './liquid_glass'
|
|
11
11
|
export * from './membership_sync_info_text'
|
|
12
12
|
export * from './native_adapters'
|
|
13
|
+
export * from './open_url'
|
|
13
14
|
export * from './pluralize'
|
|
14
15
|
export * from './conversation_safety_constants'
|
|
15
16
|
export * from './reaction_constants'
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Alert } from 'react-native'
|
|
2
|
+
import { Clipboard, Linking, Log } from './native_adapters'
|
|
3
|
+
import type { LinkingOpenURLOptions } from './native_adapters/linking'
|
|
4
|
+
|
|
5
|
+
const CONTACT_SCHEME = /^(mailto|tel):/i
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Opens a URL through the host's Linking adapter and never leaves the
|
|
9
|
+
* rejection unhandled.
|
|
10
|
+
*
|
|
11
|
+
* mailto: and tel: links fail for ordinary reasons (no mail app, no phone),
|
|
12
|
+
* so the user gets an alert offering to copy the address. Any other failure
|
|
13
|
+
* is reported through the Log adapter so it stays visible as a handled error.
|
|
14
|
+
*/
|
|
15
|
+
export function openUrl(url: string, options?: LinkingOpenURLOptions) {
|
|
16
|
+
return Linking.openURL(url, options).catch((error: unknown) => {
|
|
17
|
+
if (CONTACT_SCHEME.test(url)) {
|
|
18
|
+
alertUnableToOpen(url)
|
|
19
|
+
return
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
Log.reportError(toError(error, url), { extra: { url } })
|
|
23
|
+
})
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function alertUnableToOpen(url: string) {
|
|
27
|
+
const address = readableAddress(url)
|
|
28
|
+
|
|
29
|
+
Alert.alert('Oops', `Unable to open: ${address}`, [
|
|
30
|
+
{ text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(address) },
|
|
31
|
+
{ text: 'OK' },
|
|
32
|
+
])
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
function readableAddress(url: string) {
|
|
36
|
+
const address = url.replace(CONTACT_SCHEME, '')
|
|
37
|
+
|
|
38
|
+
try {
|
|
39
|
+
return decodeURIComponent(address)
|
|
40
|
+
} catch {
|
|
41
|
+
return address
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
function toError(error: unknown, url: string) {
|
|
46
|
+
return error instanceof Error ? error : new Error(`Unable to open URL: ${url}`)
|
|
47
|
+
}
|