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: 7 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ module.exports = {
'react/require-default-props': 0,
'jsx-a11y/no-noninteractive-tabindex': 0,
},
overrides: [
{
// https://typescript-eslint.io/linting/troubleshooting/#i-get-errors-telling-me-eslint-was-configured-to-run--however-that-tsconfig-does-not--none-of-those-tsconfigs-include-this-file
files: ['tests/*.test.tsx'],
parserOptions: { project: './tsconfig.test.json' },
},
],
};
11 changes: 10 additions & 1 deletion src/Notice.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import classNames from 'classnames';
import KeyCode from 'rc-util/lib/KeyCode';
import * as React from 'react';

export interface NoticeConfig {
content?: React.ReactNode;
Expand Down Expand Up @@ -49,6 +50,12 @@ const Notify = React.forwardRef<HTMLDivElement, NoticeProps & { times?: number }
onNoticeClose(eventKey);
};

const onCloseKeyDown: React.KeyboardEventHandler<HTMLAnchorElement> = (e) => {
if (e.key === 'Enter' || e.code === 'Enter' || e.keyCode === KeyCode.ENTER) {
onInternalClose();
}
};

// ======================== Effect ========================
React.useEffect(() => {
if (!hovering && duration > 0) {
Expand All @@ -60,6 +67,7 @@ const Notify = React.forwardRef<HTMLDivElement, NoticeProps & { times?: number }
clearTimeout(timeout);
};
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [duration, hovering, times]);

// ======================== Render ========================
Expand Down Expand Up @@ -89,6 +97,7 @@ const Notify = React.forwardRef<HTMLDivElement, NoticeProps & { times?: number }
<a
tabIndex={0}
className={`${noticePrefixCls}-close`}
onKeyDown={onCloseKeyDown}
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
Expand Down
23 changes: 21 additions & 2 deletions tests/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { fireEvent, render } from '@testing-library/react';
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import { act } from 'react-dom/test-utils';
import { useNotification } from '../src';
import type { NotificationAPI, NotificationConfig } from '../src';
import { useNotification } from '../src';

require('../assets/index.less');

Expand Down Expand Up @@ -587,6 +587,7 @@ describe('Notification.Basic', () => {
});
expect(onAllRemoved).toHaveBeenCalled();
});

it('when the same key message is closing, dont open new until it closed', () => {
const onClose = jest.fn();
const Demo = () => {
Expand Down Expand Up @@ -629,4 +630,22 @@ describe('Notification.Basic', () => {

unmount();
});

it('closes via keyboard Enter key', () => {
const { instance } = renderDemo();
let closeCount = 0;

act(() => {
instance.open({
content: <p className="test">1</p>,
closable: true,
onClose: () => {
closeCount += 1;
},
});
});

fireEvent.keyDown(document.querySelector('.rc-notification-notice-close'), { key: 'Enter' }); // origin latest
expect(closeCount).toEqual(1);
});
});
4 changes: 4 additions & 0 deletions tsconfig.test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "./tsconfig.json",
"include": ["./tests"]
}