test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-11-29 18:50:00 +08:00
Code Issues Actions 48 Packages Projects Releases Wiki Activity

fix: Popconfirm text missing (#46812)

Browse Source
This commit is contained in:
二货爱吃白萝卜 2024-01-05 15:29:18 +08:00 committed by GitHub
parent 15324982ab
commit 8f6f8de9b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/popconfirm/PurePanel.tsx
View File

@ -73,7 +73,7 @@ export const Overlay: React.FC<OverlayProps> = (props) => {
<div className={`${prefixCls}-buttons`}>
{showCancel && (
<Button onClick={onCancel} size="small" {...cancelButtonProps}>
{cancelText ?? contextLocale?.cancelText}
{cancelText || contextLocale?.cancelText}
</Button>
)}
<ActionButton
@ -88,7 +88,7 @@ export const Overlay: React.FC<OverlayProps> = (props) => {
quitOnNullishReturnValue
emitEvent
>
{okText ?? contextLocale?.okText}
{okText || contextLocale?.okText}
</ActionButton>
</div>
</div>

14
components/popconfirm/__tests__/index.test.tsx
View File

@ -1,5 +1,6 @@
import { spyElementPrototype } from 'rc-util/lib/test/domHook';
import React from 'react';
import { spyElementPrototype } from 'rc-util/lib/test/domHook';
import Popconfirm from '..';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
@ -354,4 +355,15 @@ describe('Popconfirm', () => {
expect(onOpenChange).toHaveBeenCalledTimes(1);
expect(onVisibleChange).toHaveBeenCalledTimes(1);
});
it('okText & cancelText could be empty', () => {
render(
<Popconfirm title="" okText="" cancelText="" open>
<span />
</Popconfirm>,
);
expect(document.body.querySelectorAll('.ant-btn')[0].textContent).toBe('Cancel');
expect(document.body.querySelectorAll('.ant-btn')[1].textContent).toBe('OK');
});
});