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
7 changes: 6 additions & 1 deletion react-call/src/createCallable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ export function createCallable<Props = void, Response = void, RootProps = {}>(
},
end: (...args: [Promise<Response>, Response] | [Response]) => {
const targeted = args.length === 2
return createEnd(targeted ? args[0] : null)(targeted ? args[1] : args[0])
const promise = targeted ? args[0] : null
const response = targeted ? args[1] : args[0]

if (!targeted || promise === $upsertPromise) $upsertPromise = null

return createEnd(promise)(response)
},
update: (
...args: [Promise<Response>, Partial<Props>] | [Partial<Props>]
Expand Down
22 changes: 22 additions & 0 deletions tests/src/upsert.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,26 @@ describe('upsert()', () => {
.element(screen.getByRole('dialog', { name: 'Second' }))
.toBeInTheDocument()
})

test('creates new instance after previous one is ended externally', async () => {
const screen = render(<Confirm.Root />)

Confirm.upsert({ message: 'First' })

await expect
.element(screen.getByRole('dialog', { name: 'First' }))
.toBeInTheDocument()

Confirm.end(false)

await expect
.element(screen.container.querySelector('[role="dialog"]'))
.not.toBeInTheDocument()

Confirm.upsert({ message: 'Second' })

await expect
.element(screen.getByRole('dialog', { name: 'Second' }))
.toBeInTheDocument()
})
})