test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-02 03:59:01 +08:00
Code Issues Actions 84 Packages Projects Releases Wiki Activity

fix: fix Alert findDOMNode error (#48868)

Browse Source 
* fix: fix Alert findDOMNode error

* fix: update test
This commit is contained in:
Wanpan 2024-05-10 19:18:54 +08:00 committed by GitHub
parent c9f7f5d8e6
commit eb218e80c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/alert/Alert.tsx
View File

@ -7,6 +7,7 @@ import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled'; import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled';
import classNames from 'classnames'; import classNames from 'classnames';
import CSSMotion from 'rc-motion'; import CSSMotion from 'rc-motion';
import { composeRef } from 'rc-util/es/ref';
import pickAttrs from 'rc-util/lib/pickAttrs'; import pickAttrs from 'rc-util/lib/pickAttrs';
import type { ClosableType } from '../_util/hooks/useClosable'; import type { ClosableType } from '../_util/hooks/useClosable';
@ -234,10 +235,10 @@ const Alert = React.forwardRef<AlertRef, AlertProps>((props, ref) => {
onLeaveStart={(node) => ({ maxHeight: node.offsetHeight })} onLeaveStart={(node) => ({ maxHeight: node.offsetHeight })}
onLeaveEnd={afterClose} onLeaveEnd={afterClose}
> >
{({ className: motionClassName, style: motionStyle }) => ( {({ className: motionClassName, style: motionStyle }, setRef) => (
<div <div
id={id} id={id}
ref={internalRef} ref={composeRef(internalRef, setRef)}
data-show={!closed} data-show={!closed}
className={classNames(alertCls, motionClassName)} className={classNames(alertCls, motionClassName)}
style={{ ...alert?.style, ...style, ...motionStyle }} style={{ ...alert?.style, ...style, ...motionStyle }}

8
components/alert/__tests__/index.test.tsx
View File

@ -26,6 +26,7 @@ describe('Alert', () => {
}); });
it('should show close button and could be closed', async () => { it('should show close button and could be closed', async () => {
const errSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
const onClose = jest.fn(); const onClose = jest.fn();
render( render(
<Alert <Alert
@ -36,13 +37,14 @@ describe('Alert', () => {
/>, />,
); );
await userEvent.click(screen.getByRole('button', { name: /close/i })); await act(async () => {
await userEvent.click(screen.getByRole('button', { name: /close/i }));
act(() => {
jest.runAllTimers(); jest.runAllTimers();
}); });
expect(onClose).toHaveBeenCalledTimes(1); expect(onClose).toHaveBeenCalledTimes(1);
expect(errSpy).not.toHaveBeenCalled();
errSpy.mockRestore();
}); });
it('custom action', () => { it('custom action', () => {