mcp/carbon-components-svelte
1
0
Fork 0
mirror of https://github.com/carbon-design-system/carbon-components-svelte.git synced 2025-09-15 02:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 28a895e3cc into 1f0e9a91f9

Browse source
This commit is contained in:
Eric Liu 2025-08-17 13:46:40 -07:00 • committed by GitHub
commit 77d72b43d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 142 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ListBox/ListBoxField.svelte
View file

@ -47,6 +47,7 @@
<div <div
bind:this={ref} bind:this={ref}
{role} {role}
{id}
aria-expanded={ariaExpanded} aria-expanded={ariaExpanded}
aria-owns={(ariaExpanded && menuId) || undefined} aria-owns={(ariaExpanded && menuId) || undefined}
aria-controls={(ariaExpanded && menuId) || undefined} aria-controls={(ariaExpanded && menuId) || undefined}

32
src/MultiSelect/MultiSelect.svelte
View file

@ -347,6 +347,22 @@
class="bx--list-box__invalid-icon bx--list-box__invalid-icon--warning" class="bx--list-box__invalid-icon bx--list-box__invalid-icon--warning"
/> />
{/if} {/if}
<div class:bx--list-box__field--wrapper={true}>
{#if checked.length > 0}
<ListBoxSelection
selectionCount={checked.length}
on:clear
on:clear={() => {
selectedIds = [];
sortedItems = sortedItems.map((item) => ({
...item,
checked: false,
}));
}}
translateWithId={translateWithIdSelection}
{disabled}
/>
{/if}
<ListBoxField <ListBoxField
role="button" role="button"
tabindex="0" tabindex="0"
@ -404,21 +420,6 @@
{disabled} {disabled}
{translateWithId} {translateWithId}
> >
{#if checked.length > 0}
<ListBoxSelection
selectionCount={checked.length}
on:clear
on:clear={() => {
selectedIds = [];
sortedItems = sortedItems.map((item) => ({
...item,
checked: false,
}));
}}
translateWithId={translateWithIdSelection}
{disabled}
/>
{/if}
{#if filterable} {#if filterable}
<input <input
bind:this={inputRef} bind:this={inputRef}
@ -498,6 +499,7 @@
<ListBoxMenuIcon {open} {translateWithId} /> <ListBoxMenuIcon {open} {translateWithId} />
{/if} {/if}
</ListBoxField> </ListBoxField>
</div>
<div style:display={open ? "block" : "none"}> <div style:display={open ? "block" : "none"}>
<ListBoxMenu aria-label={ariaLabel} {id} aria-multiselectable="true"> <ListBoxMenu aria-label={ariaLabel} {id} aria-multiselectable="true">
{#each filterable ? filteredItems : sortedItems as item, i (item.id)} {#each filterable ? filteredItems : sortedItems as item, i (item.id)}

16
tests/MultiSelect/MultiSelect.test.ts
View file

@ -465,20 +465,24 @@ describe("MultiSelect", () => {
selectedIds: ["0", "1"], selectedIds: ["0", "1"],
}, },
}); });
await user.click(screen.getAllByRole("button")[0]);
await openMenu();
const options = screen.getAllByRole("option"); const options = screen.getAllByRole("option");
expect(options[0]).toHaveAttribute("aria-selected", "true"); expect(options[0]).toHaveAttribute("aria-selected", "true");
expect(options[1]).toHaveAttribute("aria-selected", "true"); expect(options[1]).toHaveAttribute("aria-selected", "true");
expect(options[2]).toHaveAttribute("aria-selected", "false"); expect(options[2]).toHaveAttribute("aria-selected", "false");
const clearButton = screen.getByRole("button", { name: /clear/i }); await closeMenu();
const clearButton = screen.getByRole("button", {
name: /clear all selected items/i,
});
await user.click(clearButton); await user.click(clearButton);
await user.click(screen.getByRole("button"));
expect(options[0]).toHaveAttribute("aria-selected", "false"); await openMenu();
expect(options[1]).toHaveAttribute("aria-selected", "false"); const updatedOptions = screen.getAllByRole("option");
expect(options[2]).toHaveAttribute("aria-selected", "false"); expect(updatedOptions[0]).toHaveAttribute("aria-selected", "false");
expect(updatedOptions[1]).toHaveAttribute("aria-selected", "false");
expect(updatedOptions[2]).toHaveAttribute("aria-selected", "false");
}); });
it("skips disabled items during keyboard navigation", async () => { it("skips disabled items during keyboard navigation", async () => {