mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-08 01:53:34 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix modal.confirm unable to close normally when onCancel and onOk return true (#49054)

Browse Source 
* fix: fix modal.confirm unable to close normally when onCancel and onOk return true

* test: update test case
This commit is contained in:
Wanpan 2024-05-24 13:53:57 +08:00 committed by GitHub
parent 9db0fc7440
commit 2e011a379d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/_util/ActionButton.tsx
View File

@ -111,7 +111,7 @@ const ActionButton: React.FC<ActionButtonProps> = (props) => {
clickedRef.current = false; clickedRef.current = false;
} else { } else {
returnValueOfOnOk = actionFn(); returnValueOfOnOk = actionFn();
if (!returnValueOfOnOk) { if (!isThenable(returnValueOfOnOk)) {
onInternalClose(); onInternalClose();
return; return;
} }

20
components/modal/__tests__/confirm.test.tsx
View File

@ -949,4 +949,24 @@ describe('Modal.confirm triggers callbacks correctly', () => {
expect(document.querySelector('.ant-btn-primary')?.textContent).toBe('test'); expect(document.querySelector('.ant-btn-primary')?.textContent).toBe('test');
ConfigProvider.config({ holderRender: undefined }); ConfigProvider.config({ holderRender: undefined });
}); });
it('onCancel and onOk return any results and should be closed', async () => {
Modal.confirm({ onOk: () => true });
await waitFakeTimer();
$$('.ant-btn-primary')[0].click();
await waitFakeTimer();
expect(document.querySelector('.ant-modal-root')).toBeFalsy();
Modal.confirm({ onOk: () => false });
await waitFakeTimer();
$$('.ant-btn-primary')[0].click();
await waitFakeTimer();
expect(document.querySelector('.ant-modal-root')).toBeFalsy();
Modal.confirm({ onCancel: () => undefined });
await waitFakeTimer();
$$('.ant-btn')[0].click();
await waitFakeTimer();
expect(document.querySelector('.ant-modal-root')).toBeFalsy();
});
}); });