Skip to content

Commit

Permalink
fix(components): remove aria-label for non-interactive SwirlAvatar co…
Browse files Browse the repository at this point in the history
…mponents
  • Loading branch information
Sqrrl committed Jun 12, 2024
1 parent 891bd2e commit 839b0dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .changeset/old-mirrors-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@getflip/swirl-components": patch
"@getflip/swirl-components-angular": patch
"@getflip/swirl-components-react": patch
---

Remove aria-label for non-interactive swirl-avatar components
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" label="John Doe">
<swirl-avatar label="John Doe">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--has-icon avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__icon">
Expand Down Expand Up @@ -39,7 +39,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" label="John Doe" src="https://">
<swirl-avatar label="John Doe" src="https://">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__image">
Expand All @@ -61,7 +61,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" initials="JD" label="John Doe">
<swirl-avatar initials="JD" label="John Doe">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--has-initials avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__initials">
Expand All @@ -85,7 +85,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" icon="<swirl-icon-close></swirl-icon-close>" label="John Doe">
<swirl-avatar icon="<swirl-icon-close></swirl-icon-close>" label="John Doe">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--has-icon avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__icon">
Expand Down Expand Up @@ -153,7 +153,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" badge="<swirl-badge aria-label='3 new messages' label='3'></swirl-badge>" badge-position="top" label="John Doe">
<swirl-avatar badge="<swirl-badge aria-label='3 new messages' label='3'></swirl-badge>" badge-position="top" label="John Doe">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--has-icon avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__icon">
Expand All @@ -178,7 +178,7 @@ describe("swirl-avatar", () => {
});

expect(page.root).toEqualHtml(`
<swirl-avatar aria-label="John Doe" label="John Doe" show-label="">
<swirl-avatar label="John Doe" show-label="">
<mock:shadow-root>
<span class="avatar avatar--color-kiwi avatar--has-icon avatar--size-m avatar--variant-round" part="avatar">
<span class="avatar__icon">
Expand All @@ -202,6 +202,8 @@ describe("swirl-avatar", () => {
html: `<swirl-avatar interactive="true" label="John Doe"></swirl-avatar>`,
});

expect(page.root.getAttribute("aria-label")).toBe("John Doe");

const buttonSpy = jest.fn();

page.root.addEventListener("click", buttonSpy);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export class SwirlAvatar {

return (
<Host
aria-label={this.label}
aria-label={this.interactive ? this.label : undefined}
onKeydown={this.interactive ? this.onKeydown : undefined}
onKeyup={this.interactive ? this.onKeyup : undefined}
role={role}
Expand Down

0 comments on commit 839b0dd

Please sign in to comment.