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(select-rich): sets and removes the button role and aria attribute… #2341

Merged
merged 1 commit into from
Aug 22, 2024
Merged

fix(select-rich): sets and removes the button role and aria attribute… #2341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/nice-dots-end.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lion/ui': patch
---

[select-rich] sets and removes the button role and aria attributes on change of singleOption
14 changes: 7 additions & 7 deletions docs/components/select-rich/use-cases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const renderOptions = ({ shadowRoot }) => {
}
return html`
<lion-select-rich label="Credit Card" name="color" @model-value-changed="${showOutput}">
${objs.map(obj => html` <lion-option .choiceValue="${obj}>${obj.label}</lion-option> `)}"
${objs.map(obj => html` <lion-option .choiceValue="${obj}">${obj.label}</lion-option> `)}
</lion-select-rich>
<p>Full value:</p>
<pre id="demoRenderOutput"></pre>
Expand Down Expand Up @@ -222,11 +222,11 @@ Often, you may want a placeholder that appears initially, but cannot be selected
For this you can use `has-no-default-selected` attribute.

```html preview-story
<lion-select-rich name="favoriteColor" label="Favorite color" has-no-default-selected>
<lion-option .choiceValue="${'red'}">Red</lion-option>
<lion-option .choiceValue="${'hotpink'}">Hotpink</lion-option>
<lion-option .choiceValue="${'teal'}">Teal</lion-option>
</lion-select-rich>
<lion-select-rich name="favoriteColor" label="Favorite color" has-no-default-selected>
<lion-option .choiceValue="${'red'}">Red</lion-option>
<lion-option .choiceValue="${'hotpink'}">Hotpink</lion-option>
<lion-option .choiceValue="${'teal'}">Teal</lion-option>
</lion-select-rich>
```

> By default, the placeholder is completely empty in the `LionSelectInvoker`,
Expand Down Expand Up @@ -264,7 +264,7 @@ class SingleOptionRemoveAdd extends LitElement {
<lion-select-rich name="favoriteColor" label="Favorite color">
<lion-options slot="input">
${this.options.map(
option => html` <lion-option .choiceValue="${option}>${option}"</lion-option> `,
option => html` <lion-option .choiceValue="${option}">${option}</lion-option> `,
)}
</lion-options>
</lion-select-rich>
Expand Down
12 changes: 12 additions & 0 deletions packages/ui/components/select-rich/src/LionSelectRich.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,18 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
}
}

if (changedProperties.has('singleOption')) {
if (this.singleOption) {
this._invokerNode.removeAttribute('role');
this._invokerNode.removeAttribute('aria-haspopup');
this._invokerNode.removeAttribute('aria-expanded');
} else {
this._invokerNode.setAttribute('role', 'button');
this._invokerNode.setAttribute('aria-haspopup', 'listbox');
this._invokerNode.setAttribute('aria-expanded', `${this.opened}`);
}
}

if (this._inputNode && this._invokerNode) {
if (changedProperties.has('_ariaLabelledNodes')) {
this._invokerNode.setAttribute(
Expand Down
26 changes: 26 additions & 0 deletions packages/ui/components/select-rich/test/lion-select-rich.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,32 @@ describe('lion-select-rich', () => {
expect(_invokerNode.hasAttribute('single-option')).to.be.true;
});

it('sets and removes the button role and aria attributes on change of singleOption', async () => {
const el = await fixture(html`
<lion-select-rich>
<lion-option .choiceValue=${10}>Item 1</lion-option>
<lion-option .choiceValue=${20}>Item 2</lion-option>
</lion-select-rich>
`);
const { _invokerNode } = getSelectRichMembers(el);

expect(_invokerNode.hasAttribute('role')).to.be.true;
expect(_invokerNode.hasAttribute('aria-haspopup')).to.be.true;
expect(_invokerNode.hasAttribute('aria-expanded')).to.be.true;

el.singleOption = true;
await el.updateComplete;
expect(_invokerNode.hasAttribute('role')).to.be.false;
expect(_invokerNode.hasAttribute('aria-haspopup')).to.be.false;
expect(_invokerNode.hasAttribute('aria-expanded')).to.be.false;

el.singleOption = false;
await el.updateComplete;
expect(_invokerNode.hasAttribute('role')).to.be.true;
expect(_invokerNode.hasAttribute('aria-haspopup')).to.be.true;
expect(_invokerNode.hasAttribute('aria-expanded')).to.be.true;
});

it('updates the invoker when the selected element is the same but the modelValue was updated asynchronously', async () => {
const tagString = defineCE(
class LionCustomOption extends LionOption {
Expand Down