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
19 changes: 19 additions & 0 deletions core/src/components/toast/test/a11y/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,32 @@ <h1 style="background-color: white">Toast - a11y</h1>
Present Controller Toast
</ion-button>

<ion-button id="aria-label-toast-trigger">Present Aria Label Toast</ion-button>
<ion-toast
id="aria-label-toast"
trigger="aria-label-toast-trigger"
header="Aria Label Toast Header"
message="Aria Label Toast Message"
></ion-toast>

<ion-button onclick="updateContent()">Update Inner Content</ion-button>
</main>
</ion-app>
<script>
const inlineToast = document.querySelector('#inline-toast');
inlineToast.buttons = ['Ok'];

const ariaLabelToast = document.querySelector('#aria-label-toast');
ariaLabelToast.buttons = [
{
icon: 'close',
htmlAttributes: {
'aria-label': 'close button',
'aria-labelledby': 'close-label',
},
},
];

const presentToast = async (opts) => {
const toast = await toastController.create(opts);

Expand Down
22 changes: 18 additions & 4 deletions core/src/components/toast/test/a11y/toast.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ configs({ directions: ['ltr'] }).forEach(({ title, config }) => {
await page.goto(`/src/components/toast/test/a11y`, config);
});
test('should not have any axe violations with inline toasts', async ({ page }) => {
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
const didPresent = await page.spyOnEvent('ionToastDidPresent');

await page.click('#inline-toast-trigger');
await ionToastDidPresent.next();
await didPresent.next();

/**
* IonToast overlays the entire screen, so
Expand All @@ -25,10 +25,10 @@ configs({ directions: ['ltr'] }).forEach(({ title, config }) => {
expect(results.violations).toEqual([]);
});
test('should not have any axe violations with controller toasts', async ({ page }) => {
const ionToastDidPresent = await page.spyOnEvent('ionToastDidPresent');
const didPresent = await page.spyOnEvent('ionToastDidPresent');

await page.click('#controller-toast-trigger');
await ionToastDidPresent.next();
await didPresent.next();

/**
* IonToast overlays the entire screen, so
Expand All @@ -38,5 +38,19 @@ configs({ directions: ['ltr'] }).forEach(({ title, config }) => {
const results = await new AxeBuilder({ page }).disableRules('color-contrast').analyze();
expect(results.violations).toEqual([]);
});

test('should have aria-labelledby and aria-label added to the button when htmlAttributes is set', async ({
page,
}) => {
const didPresent = await page.spyOnEvent('ionToastDidPresent');

await page.click('#aria-label-toast-trigger');
await didPresent.next();

const toastButton = page.locator('#aria-label-toast .toast-button');

await expect(toastButton).toHaveAttribute('aria-labelledby', 'close-label');
await expect(toastButton).toHaveAttribute('aria-label', 'close button');
});
});
});
1 change: 1 addition & 0 deletions core/src/components/toast/toast-interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export interface ToastButton {
side?: 'start' | 'end';
role?: 'cancel' | string;
cssClass?: string | string[];
htmlAttributes?: { [key: string]: any };
handler?: () => boolean | void | Promise<boolean | void>;
}

Expand Down
9 changes: 8 additions & 1 deletion core/src/components/toast/toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,14 @@ export class Toast implements ComponentInterface, OverlayInterface {
return (
<div class={buttonGroupsClasses}>
{buttons.map((b) => (
<button type="button" class={buttonClass(b)} tabIndex={0} onClick={() => this.buttonClick(b)} part="button">
<button
{...b.htmlAttributes}
type="button"
class={buttonClass(b)}
tabIndex={0}
onClick={() => this.buttonClick(b)}
part="button"
>
<div class="toast-button-inner">
{b.icon && (
<ion-icon
Expand Down