@planningcenter/chat-react-native 4.7.1-qa-staging.3 → 4.7.1-qa-staging.5
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.js +4 -4
- 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 +0 -1
- package/build/utils/index.d.ts.map +1 -1
- package/build/utils/index.js +0 -1
- package/build/utils/index.js.map +1 -1
- package/build/utils/native_adapters/linking.d.ts.map +1 -1
- package/build/utils/native_adapters/linking.js +48 -2
- package/build/utils/native_adapters/linking.js.map +1 -1
- 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 +5 -2
- package/src/components/conversation/attachments/giphy_attachment.tsx +4 -2
- 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 +4 -4
- 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/date.ts +4 -4
- package/src/utils/index.ts +0 -1
- package/src/utils/native_adapters/__tests__/linking.test.ts +60 -4
- package/src/utils/native_adapters/linking.ts +50 -2
- package/build/utils/open_url.d.ts +0 -11
- package/build/utils/open_url.d.ts.map +0 -1
- package/build/utils/open_url.js +0 -46
- package/build/utils/open_url.js.map +0 -1
- package/src/utils/__tests__/open_url.test.ts +0 -67
- package/src/utils/open_url.ts +0 -47
|
@@ -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
|
+
})
|
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,7 +10,6 @@ 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'
|
|
14
13
|
export * from './pluralize'
|
|
15
14
|
export * from './conversation_safety_constants'
|
|
16
15
|
export * from './reaction_constants'
|
|
@@ -1,12 +1,68 @@
|
|
|
1
|
+
import { Alert } from 'react-native'
|
|
2
|
+
import { Clipboard, Log } from '../configuration'
|
|
1
3
|
import { LinkingAdapter } from '../linking'
|
|
2
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
|
+
const buildAdapter = (openURL: jest.Mock) =>
|
|
13
|
+
new LinkingAdapter({ openURL, canOpenURL: async () => true })
|
|
14
|
+
|
|
3
15
|
describe('LinkingAdapter', () => {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const adapter = new LinkingAdapter({ openURL, canOpenURL: async () => true })
|
|
16
|
+
let setStringAsync: jest.SpyInstance
|
|
17
|
+
let reportError: jest.SpyInstance
|
|
7
18
|
|
|
8
|
-
|
|
19
|
+
beforeEach(() => {
|
|
20
|
+
jest.spyOn(Alert, 'alert').mockImplementation(() => {})
|
|
21
|
+
setStringAsync = jest.spyOn(Clipboard, 'setStringAsync').mockResolvedValue()
|
|
22
|
+
reportError = jest.spyOn(Log, 'reportError').mockImplementation(() => {})
|
|
23
|
+
})
|
|
24
|
+
|
|
25
|
+
afterEach(() => {
|
|
26
|
+
jest.restoreAllMocks()
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
it('forwards the url and options to the host', async () => {
|
|
30
|
+
const openURL = jest.fn().mockResolvedValue(true)
|
|
31
|
+
|
|
32
|
+
await buildAdapter(openURL).openURL('https://example.com', { forceOpenInBrowser: true })
|
|
9
33
|
|
|
10
34
|
expect(openURL).toHaveBeenCalledWith('https://example.com', { forceOpenInBrowser: true })
|
|
35
|
+
expect(Alert.alert).not.toHaveBeenCalled()
|
|
36
|
+
expect(reportError).not.toHaveBeenCalled()
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
it('reports a failed web link instead of alerting', async () => {
|
|
40
|
+
const error = new Error('Unable to open URL')
|
|
41
|
+
const openURL = jest.fn().mockRejectedValue(error)
|
|
42
|
+
|
|
43
|
+
await buildAdapter(openURL).openURL('https://youtu.be/abc')
|
|
44
|
+
|
|
45
|
+
expect(reportError).toHaveBeenCalledWith(error, { extra: { url: 'https://youtu.be/abc' } })
|
|
46
|
+
expect(Alert.alert).not.toHaveBeenCalled()
|
|
47
|
+
})
|
|
48
|
+
|
|
49
|
+
it.each([
|
|
50
|
+
['mailto', 'mailto:admin@example.com', 'admin@example.com'],
|
|
51
|
+
['encoded mailto', encodeURI('mailto:first last@example.com'), 'first last@example.com'],
|
|
52
|
+
['tel', 'tel:+1 (555) 555-0100', '+1 (555) 555-0100'],
|
|
53
|
+
])('alerts and offers to copy the bare address for a %s link', async (_name, url, address) => {
|
|
54
|
+
const openURL = jest.fn().mockRejectedValue(new Error('No Activity found'))
|
|
55
|
+
|
|
56
|
+
await buildAdapter(openURL).openURL(url)
|
|
57
|
+
|
|
58
|
+
expect(Alert.alert).toHaveBeenCalledWith(
|
|
59
|
+
'Oops',
|
|
60
|
+
`Unable to open: ${address}`,
|
|
61
|
+
expect.arrayContaining([expect.objectContaining({ text: 'Copy to clipboard' })])
|
|
62
|
+
)
|
|
63
|
+
expect(reportError).not.toHaveBeenCalled()
|
|
64
|
+
|
|
65
|
+
pressButton('Copy to clipboard')
|
|
66
|
+
expect(setStringAsync).toHaveBeenCalledWith(address)
|
|
11
67
|
})
|
|
12
68
|
})
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Linking } from 'react-native'
|
|
1
|
+
import { Alert, Linking } from 'react-native'
|
|
2
|
+
import { Clipboard, Log } from './configuration'
|
|
2
3
|
|
|
3
4
|
export type LinkingOpenURLOptions = {
|
|
4
5
|
forceOpenInBrowser?: boolean
|
|
@@ -9,12 +10,59 @@ type LinkingMethods = {
|
|
|
9
10
|
canOpenURL: Linking['canOpenURL']
|
|
10
11
|
}
|
|
11
12
|
|
|
13
|
+
const CONTACT_SCHEME = /^(mailto|tel):/i
|
|
14
|
+
|
|
12
15
|
export class LinkingAdapter {
|
|
13
16
|
openURL: LinkingMethods['openURL']
|
|
14
17
|
canOpenURL: LinkingMethods['canOpenURL']
|
|
15
18
|
|
|
16
19
|
constructor(methods: LinkingMethods) {
|
|
17
|
-
|
|
20
|
+
const openURL = methods.openURL.bind(Linking)
|
|
21
|
+
|
|
22
|
+
this.openURL = async (...args) => {
|
|
23
|
+
try {
|
|
24
|
+
await openURL(...args)
|
|
25
|
+
} catch (error) {
|
|
26
|
+
handleOpenFailure(args[0], error)
|
|
27
|
+
}
|
|
28
|
+
}
|
|
18
29
|
this.canOpenURL = methods.canOpenURL.bind(Linking)
|
|
19
30
|
}
|
|
20
31
|
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* mailto: and tel: links fail for ordinary reasons (no mail app, no phone),
|
|
35
|
+
* so the user gets an alert offering to copy the address. Any other failure
|
|
36
|
+
* is reported through the Log adapter so it stays visible as a handled error.
|
|
37
|
+
*/
|
|
38
|
+
function handleOpenFailure(url: string, error: unknown) {
|
|
39
|
+
if (CONTACT_SCHEME.test(url)) {
|
|
40
|
+
alertUnableToOpen(url)
|
|
41
|
+
return
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
Log.reportError(toError(error, url), { extra: { url } })
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function alertUnableToOpen(url: string) {
|
|
48
|
+
const address = readableAddress(url)
|
|
49
|
+
|
|
50
|
+
Alert.alert('Oops', `Unable to open: ${address}`, [
|
|
51
|
+
{ text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(address) },
|
|
52
|
+
{ text: 'OK' },
|
|
53
|
+
])
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function readableAddress(url: string) {
|
|
57
|
+
const address = url.replace(CONTACT_SCHEME, '')
|
|
58
|
+
|
|
59
|
+
try {
|
|
60
|
+
return decodeURIComponent(address)
|
|
61
|
+
} catch {
|
|
62
|
+
return address
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function toError(error: unknown, url: string) {
|
|
67
|
+
return error instanceof Error ? error : new Error(`Unable to open URL: ${url}`)
|
|
68
|
+
}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { LinkingOpenURLOptions } from './native_adapters/linking';
|
|
2
|
-
/**
|
|
3
|
-
* Opens a URL through the host's Linking adapter and never leaves the
|
|
4
|
-
* rejection unhandled.
|
|
5
|
-
*
|
|
6
|
-
* mailto: and tel: links fail for ordinary reasons (no mail app, no phone),
|
|
7
|
-
* so the user gets an alert offering to copy the address. Any other failure
|
|
8
|
-
* is reported through the Log adapter so it stays visible as a handled error.
|
|
9
|
-
*/
|
|
10
|
-
export declare function openUrl(url: string, options?: LinkingOpenURLOptions): Promise<unknown>;
|
|
11
|
-
//# sourceMappingURL=open_url.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"open_url.d.ts","sourceRoot":"","sources":["../../src/utils/open_url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAItE;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,oBASnE"}
|
package/build/utils/open_url.js
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { Alert } from 'react-native';
|
|
2
|
-
import { Clipboard, Linking, Log } from './native_adapters';
|
|
3
|
-
const CONTACT_SCHEME = /^(mailto|tel):/i;
|
|
4
|
-
|
|
5
|
-
/**
|
|
6
|
-
* Opens a URL through the host's Linking adapter and never leaves the
|
|
7
|
-
* rejection unhandled.
|
|
8
|
-
*
|
|
9
|
-
* mailto: and tel: links fail for ordinary reasons (no mail app, no phone),
|
|
10
|
-
* so the user gets an alert offering to copy the address. Any other failure
|
|
11
|
-
* is reported through the Log adapter so it stays visible as a handled error.
|
|
12
|
-
*/
|
|
13
|
-
export function openUrl(url, options) {
|
|
14
|
-
return Linking.openURL(url, options).catch(error => {
|
|
15
|
-
if (CONTACT_SCHEME.test(url)) {
|
|
16
|
-
alertUnableToOpen(url);
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
Log.reportError(toError(error, url), {
|
|
20
|
-
extra: {
|
|
21
|
-
url
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
function alertUnableToOpen(url) {
|
|
27
|
-
const address = readableAddress(url);
|
|
28
|
-
Alert.alert('Oops', `Unable to open: ${address}`, [{
|
|
29
|
-
text: 'Copy to clipboard',
|
|
30
|
-
onPress: () => Clipboard.setStringAsync(address)
|
|
31
|
-
}, {
|
|
32
|
-
text: 'OK'
|
|
33
|
-
}]);
|
|
34
|
-
}
|
|
35
|
-
function readableAddress(url) {
|
|
36
|
-
const address = url.replace(CONTACT_SCHEME, '');
|
|
37
|
-
try {
|
|
38
|
-
return decodeURIComponent(address);
|
|
39
|
-
} catch {
|
|
40
|
-
return address;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
function toError(error, url) {
|
|
44
|
-
return error instanceof Error ? error : new Error(`Unable to open URL: ${url}`);
|
|
45
|
-
}
|
|
46
|
-
//# sourceMappingURL=open_url.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"open_url.js","names":["Alert","Clipboard","Linking","Log","CONTACT_SCHEME","openUrl","url","options","openURL","catch","error","test","alertUnableToOpen","reportError","toError","extra","address","readableAddress","alert","text","onPress","setStringAsync","replace","decodeURIComponent","Error"],"sources":["../../src/utils/open_url.ts"],"sourcesContent":["import { Alert } from 'react-native'\nimport { Clipboard, Linking, Log } from './native_adapters'\nimport type { LinkingOpenURLOptions } from './native_adapters/linking'\n\nconst CONTACT_SCHEME = /^(mailto|tel):/i\n\n/**\n * Opens a URL through the host's Linking adapter and never leaves the\n * rejection unhandled.\n *\n * mailto: and tel: links fail for ordinary reasons (no mail app, no phone),\n * so the user gets an alert offering to copy the address. Any other failure\n * is reported through the Log adapter so it stays visible as a handled error.\n */\nexport function openUrl(url: string, options?: LinkingOpenURLOptions) {\n return Linking.openURL(url, options).catch((error: unknown) => {\n if (CONTACT_SCHEME.test(url)) {\n alertUnableToOpen(url)\n return\n }\n\n Log.reportError(toError(error, url), { extra: { url } })\n })\n}\n\nfunction alertUnableToOpen(url: string) {\n const address = readableAddress(url)\n\n Alert.alert('Oops', `Unable to open: ${address}`, [\n { text: 'Copy to clipboard', onPress: () => Clipboard.setStringAsync(address) },\n { text: 'OK' },\n ])\n}\n\nfunction readableAddress(url: string) {\n const address = url.replace(CONTACT_SCHEME, '')\n\n try {\n return decodeURIComponent(address)\n } catch {\n return address\n }\n}\n\nfunction toError(error: unknown, url: string) {\n return error instanceof Error ? error : new Error(`Unable to open URL: ${url}`)\n}\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,cAAc;AACpC,SAASC,SAAS,EAAEC,OAAO,EAAEC,GAAG,QAAQ,mBAAmB;AAG3D,MAAMC,cAAc,GAAG,iBAAiB;;AAExC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAACC,GAAW,EAAEC,OAA+B,EAAE;EACpE,OAAOL,OAAO,CAACM,OAAO,CAACF,GAAG,EAAEC,OAAO,CAAC,CAACE,KAAK,CAAEC,KAAc,IAAK;IAC7D,IAAIN,cAAc,CAACO,IAAI,CAACL,GAAG,CAAC,EAAE;MAC5BM,iBAAiB,CAACN,GAAG,CAAC;MACtB;IACF;IAEAH,GAAG,CAACU,WAAW,CAACC,OAAO,CAACJ,KAAK,EAAEJ,GAAG,CAAC,EAAE;MAAES,KAAK,EAAE;QAAET;MAAI;IAAE,CAAC,CAAC;EAC1D,CAAC,CAAC;AACJ;AAEA,SAASM,iBAAiBA,CAACN,GAAW,EAAE;EACtC,MAAMU,OAAO,GAAGC,eAAe,CAACX,GAAG,CAAC;EAEpCN,KAAK,CAACkB,KAAK,CAAC,MAAM,EAAE,mBAAmBF,OAAO,EAAE,EAAE,CAChD;IAAEG,IAAI,EAAE,mBAAmB;IAAEC,OAAO,EAAEA,CAAA,KAAMnB,SAAS,CAACoB,cAAc,CAACL,OAAO;EAAE,CAAC,EAC/E;IAAEG,IAAI,EAAE;EAAK,CAAC,CACf,CAAC;AACJ;AAEA,SAASF,eAAeA,CAACX,GAAW,EAAE;EACpC,MAAMU,OAAO,GAAGV,GAAG,CAACgB,OAAO,CAAClB,cAAc,EAAE,EAAE,CAAC;EAE/C,IAAI;IACF,OAAOmB,kBAAkB,CAACP,OAAO,CAAC;EACpC,CAAC,CAAC,MAAM;IACN,OAAOA,OAAO;EAChB;AACF;AAEA,SAASF,OAAOA,CAACJ,KAAc,EAAEJ,GAAW,EAAE;EAC5C,OAAOI,KAAK,YAAYc,KAAK,GAAGd,KAAK,GAAG,IAAIc,KAAK,CAAC,uBAAuBlB,GAAG,EAAE,CAAC;AACjF","ignoreList":[]}
|
|
@@ -1,67 +0,0 @@
|
|
|
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/open_url.ts
DELETED
|
@@ -1,47 +0,0 @@
|
|
|
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
|
-
}
|