Skip to content

feat(combobox): append custom values to top of dropdown #9817

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

Merged
aPreciado88 merged 2 commits into from
Jul 23, 2024
Merged

feat(combobox): append custom values to top of dropdown #9817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
551927d
feat(combobox): append custom values to top of dropdown
aPreciado88 Jul 19, 2024
05682b7
feat(combobox): update end to end test
aPreciado88 Jul 22, 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
12 changes: 6 additions & 6 deletions packages/calcite-components/src/components/combobox/combobox.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ describe("calcite-combobox", () => {
await input.press("Enter");
await page.waitForChanges();

const item = await page.find("calcite-combobox-item:last-child");
const item = await page.find("calcite-combobox-item:first-child");
expect(await item.getProperty("textLabel")).toBe("K");

const combobox = await page.find("calcite-combobox");
Expand All @@ -902,14 +902,14 @@ describe("calcite-combobox", () => {
await input.press("Enter");
await page.waitForChanges();

const customValue = await page.find("calcite-combobox-item:first-child");
const item1 = await page.find("calcite-combobox-item#one");
const item2 = await page.find("calcite-combobox-item:last-child");

expect(await item2.getProperty("textLabel")).toBe("K");
expect(await customValue.getProperty("textLabel")).toBe("K");

expect((await combobox.getProperty("selectedItems")).length).toBe(1);
expect(await customValue.getProperty("selected")).toBe(true);
expect(await item1.getProperty("selected")).toBe(false);
expect(await item2.getProperty("selected")).toBe(true);
});

it("should auto-select new custom values in multiple selection mode", async () => {
Expand All @@ -930,16 +930,16 @@ describe("calcite-combobox", () => {
await input.press("Escape");
await page.waitForChanges();

const customValue = await page.find("calcite-combobox-item:first-child");
const item1 = await page.find("calcite-combobox-item#one");
const item2 = await page.find("calcite-combobox-item#two");
const item3 = await page.find("calcite-combobox-item:last-child");
const chips = await page.findAll("calcite-combobox >>> calcite-chip");

expect((await combobox.getProperty("selectedItems")).length).toBe(3);
expect(chips[2].textContent).toBe("K");
expect(await customValue.getProperty("selected")).toBe(true);
expect(await item1.getProperty("selected")).toBe(true);
expect(await item2.getProperty("selected")).toBe(true);
expect(await item3.getProperty("selected")).toBe(true);
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/combobox/combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ export class Combobox
item.value = value;
item.textLabel = value;
item.selected = true;
this.el.appendChild(item);
this.el.prepend(item);
this.resetText();
if (focus) {
this.setFocus();
Expand Down