Skip to content

fix: don't confirm a modal while its confirm button is disabled #3880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexAndBear merged 1 commit into from
Oct 19, 2026
Merged

fix: don't confirm a modal while its confirm button is disabled #3880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions packages/web-runtime/src/components/ModalWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ const setCustomComponentRef = (id: Modal['id'], instance: unknown) => {
}

const onModalConfirm = async (modal: Modal, value?: unknown) => {
// custom components can confirm on their own (e.g. on Enter), which must not bypass the disabled button
if (modal.confirmDisabled) {
return
}

const customComponent = customComponentRefs.get(modal.id)

try {
Expand Down
10 changes: 10 additions & 0 deletions packages/web-runtime/tests/unit/components/ModalWrapper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ describe('ModalWrapper', () => {
expect(modalStore.updateModal).toHaveBeenCalled()
expect(modalStore.removeModal).toHaveBeenCalledWith(activeModal.id)
})
it('does nothing if confirm is disabled', async () => {
const activeModal = modal({ onConfirm: vi.fn(), confirmDisabled: true })
const { wrapper } = getShallowWrapper({ modals: [activeModal] })
const modalStore = useModals()

await (wrapper.vm as any).onModalConfirm(activeModal)

expect(activeModal.onConfirm).not.toHaveBeenCalled()
expect(modalStore.removeModal).not.toHaveBeenCalled()
})
it('does not remove the modal if the promise has not been resolved', async () => {
const activeModal = modal({ onConfirm: vi.fn().mockRejectedValue(new Error('')) })
const { wrapper } = getShallowWrapper({ modals: [activeModal] })
Expand Down
Loading