Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 51 additions & 5 deletions packages/use-segment/src/__tests__/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@ import { renderHook } from '@testing-library/react-hooks'
import React, { ReactNode } from 'react'
import waitForExpect from 'wait-for-expect'
import SegmentProvider, { useSegment } from '..'
import type { Analytics, SegmentProviderProps } from '..'
import type { Analytics, OnEventError, SegmentProviderProps } from '..'

const eventError = new Error('Error Event')

const defaultEvents = {
errorEvent: (_?: Analytics, onEventError?: OnEventError) => async () => {
try {
await new Promise((resolve, reject) => {
reject(eventError)
})
} catch (error) {
await onEventError?.(error as Error)
}
},
pageVisited:
(analytics?: Analytics) =>
async (
Expand Down Expand Up @@ -34,6 +45,7 @@ const wrapper =
settings,
initOptions,
onError,
onEventError,
events = defaultEvents,
cdn,
}: Omit<SegmentProviderProps<DefaultEvents>, 'children'>) =>
Expand All @@ -43,6 +55,7 @@ const wrapper =
settings={settings}
initOptions={initOptions}
onError={onError}
onEventError={onEventError}
events={events}
cdn={cdn}
>
Expand Down Expand Up @@ -124,9 +137,8 @@ describe('segment hook', () => {
})

it('Provider should load and call onError on analytics load error', async () => {
const mock = jest
.spyOn(AnalyticsBrowser, 'load')
.mockRejectedValue(new Error('not good'))
const error = new Error('not good')
const mock = jest.spyOn(AnalyticsBrowser, 'load').mockRejectedValue(error)

const onError = jest.fn()
const settings = { writeKey: 'pleasethrow' }
Expand All @@ -144,7 +156,41 @@ describe('segment hook', () => {

await waitForExpect(() => {
expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith(new Error('not good'))
expect(onError).toHaveBeenCalledWith(error)
})
})

it('Provider call onEventError when an event is trigger with an error', async () => {
const mock = jest
.spyOn(AnalyticsBrowser, 'load')
.mockResolvedValue([{} as Analytics, {} as Context])

const onEventError = jest.fn()
const onError = jest.fn()

const settings = { writeKey: 'pleasethrow' }

const { result, waitForNextUpdate } = renderHook(
() => useSegment<DefaultEvents>(),
{
wrapper: wrapper({
events: defaultEvents,
onError,
onEventError,
settings,
}),
},
)

expect(mock).toHaveBeenCalledTimes(1)

await waitForNextUpdate()

await result.current.events.errorEvent()

await waitForExpect(() => {
expect(onEventError).toHaveBeenCalledTimes(1)
expect(onEventError).toHaveBeenCalledWith(eventError)
})
})

Expand Down
12 changes: 9 additions & 3 deletions packages/use-segment/src/useSegment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ import React, {
useState,
} from 'react'

export type OnEventError = (error: Error) => Promise<void> | void
type EventFunction = (...args: never[]) => Promise<void>
type Events = Record<string, (analytics?: Analytics) => EventFunction>
type Events = Record<
string,
(analytics?: Analytics, onEventError?: OnEventError) => EventFunction
>

interface SegmentContextInterface<T extends Events = Events> {
analytics: Analytics | undefined
Expand All @@ -41,6 +45,7 @@ export type SegmentProviderProps<T> = {
settings?: AnalyticsSettings
initOptions?: InitOptions
onError?: (err: Error) => void
onEventError?: OnEventError
events: T
children: ReactNode
}
Expand All @@ -58,6 +63,7 @@ function SegmentProvider<T extends Events>({
settings,
initOptions,
onError,
onEventError,
events,
cdn,
}: SegmentProviderProps<T>) {
Expand Down Expand Up @@ -86,7 +92,7 @@ function SegmentProvider<T extends Events>({
const curiedEvents = Object.entries(events).reduce(
(acc, [eventName, eventFn]) => ({
...acc,
[eventName]: eventFn(internalAnalytics),
[eventName]: eventFn(internalAnalytics, onEventError),
}),
{},
) as { [K in keyof T]: ReturnType<T[K]> }
Expand All @@ -95,7 +101,7 @@ function SegmentProvider<T extends Events>({
analytics: internalAnalytics,
events: curiedEvents,
}
}, [internalAnalytics, events])
}, [internalAnalytics, events, onEventError])

return (
<SegmentContext.Provider value={value}>{children}</SegmentContext.Provider>
Expand Down