Skip to content
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

Jump to bottom

fix: add close button accessible name props to ToastNotification #462

Merged
merged 3 commits into from
May 17, 2024
Merged

fix: add close button accessible name props to ToastNotification #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2386f70
fix: add close button accessible name props to ToastNotification
maxinteger May 16, 2024
1060272
fix: pr comment
maxinteger May 17, 2024
db8c700
fix: update snapshot
maxinteger May 17, 2024
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
15 changes: 15 additions & 0 deletions src/components/NotificationSystem/NotificationSystem.unit.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot 1`] = `
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -178,6 +179,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -290,6 +292,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot if notification c
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -402,6 +405,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot when limit is set
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -514,6 +518,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with body class n
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -626,6 +631,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with className 1`
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -738,6 +744,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with container cl
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -846,6 +853,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different at
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -951,6 +959,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different po
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1067,6 +1076,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with different zI
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1179,6 +1189,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with enter animat
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1291,6 +1302,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with id 1`] = `
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1403,6 +1415,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with newest on to
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1515,6 +1528,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with style 1`] =
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down Expand Up @@ -1627,6 +1641,7 @@ exports[`<NotificationSystem /> snapshot should match snapshot with toast class
class="md-toast-notification-close-button"
>
<button
aria-label="Close notification"
class="md-button-circle-wrapper md-button-simple-wrapper"
data-color="primary"
data-disabled="false"
Expand Down
4 changes: 3 additions & 1 deletion src/components/ToastNotification/ToastNotification.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const CLASS_PREFIX = 'md-toast-notification';

const DEFAULTS = {};
const DEFAULTS = {
CLOSE_BUTTON_LABEL: 'Close notification',
};

const STYLE = {
wrapper: `${CLASS_PREFIX}-wrapper`,
Expand Down
12 changes: 12 additions & 0 deletions src/components/ToastNotification/ToastNotification.stories.args.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ const toastNotificationArgTypes = {
},
},
},
closeButtonLabel: {
description: 'Accessible name of the close button',
control: { type: 'text' },
table: {
type: {
summary: 'string',
},
defaultValue: {
summary: 'undefined',
},
},
},
};

export { toastNotificationArgTypes };
Expand Down
15 changes: 12 additions & 3 deletions src/components/ToastNotification/ToastNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ModalContainer from '../ModalContainer';
import ButtonCircle from '../ButtonCircle';
import Icon from '../Icon';

import { STYLE } from './ToastNotification.constants';
import { STYLE, DEFAULTS } from './ToastNotification.constants';
import { Props } from './ToastNotification.types';
import './ToastNotification.style.scss';
import Text from '../Text';
Expand All @@ -14,7 +14,16 @@ import Text from '../Text';
* The ToastNotification component.
*/
const ToastNotification: FC<Props> = (props: Props) => {
const { className, id, style, content, leadingVisual, buttonGroup, onClose } = props;
const {
className,
id,
style,
content,
leadingVisual,
buttonGroup,
onClose,
closeButtonLabel = DEFAULTS.CLOSE_BUTTON_LABEL,
} = props;

return (
<ModalContainer
Expand All @@ -37,7 +46,7 @@ const ToastNotification: FC<Props> = (props: Props) => {
)}
{onClose && (
<div className={classnames(className, STYLE.closeButton)}>
<ButtonCircle size={20} ghost onPress={onClose}>
<ButtonCircle size={20} ghost onPress={onClose} aria-label={closeButtonLabel}>
<Icon name="cancel" weight="bold" scale={16} />
</ButtonCircle>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/components/ToastNotification/ToastNotification.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,9 @@ export interface Props {
* Callback when user clicks on the close button.
*/
onClose?: (event: PressEvent) => void;

/**
* Close button's aria-label
*/
closeButtonLabel?: string;
}
21 changes: 19 additions & 2 deletions src/components/ToastNotification/ToastNotification.unit.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ describe('<ToastNotification />', () => {

const style = { color: 'pink' };

const container = await mountAndWait(<ToastNotification style={style} content={exampleContent} />);
const container = await mountAndWait(
<ToastNotification style={style} content={exampleContent} />
);

expect(container).toMatchSnapshot();
});
Expand Down Expand Up @@ -158,14 +160,29 @@ describe('<ToastNotification />', () => {
});

it('should wrap the onClose inside when onClose is provided', async () => {
expect.assertions(1);
expect.assertions(2);

const wrapper = await mountAndWait(
<ToastNotification onClose={onClose} content={exampleContent} />
);
const element = wrapper.find('.md-toast-notification-close-button').getDOMNode();
const button = wrapper.find('.md-toast-notification-close-button button');

expect(element).toBeDefined();
expect(button.props()['aria-label']).toBe(CONSTANTS.DEFAULTS.CLOSE_BUTTON_LABEL);
});

it('should have label of the close button when both onClose and closeButtonLabel defined', async () => {
expect.assertions(2);

const wrapper = await mountAndWait(
<ToastNotification onClose={onClose} closeButtonLabel={'close'} content={exampleContent} />
);
const element = wrapper.find('.md-toast-notification-close-button').getDOMNode();
const button = wrapper.find('.md-toast-notification-close-button button');

expect(element).toBeDefined();
expect(button.props()['aria-label']).toBe('close');
});

it('should wrap Icon inside leadingVisual when Icon is provided', async () => {
Expand Down
Loading