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 1 commit
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
46 changes: 34 additions & 12 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 @@ -889,8 +889,8 @@ describe("calcite-combobox", () => {
await skipAnimations(page);
await page.setContent(html`
<calcite-combobox allow-custom-values selection-mode="single">
<calcite-combobox-item selected id="one" value="one" text-label="one"></calcite-combobox-item>
Copy link
Member

@jcfranco jcfranco Jul 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the move of the selected attribute affect the test? If so, there might be an issue. If not, let's restore it. Applies to similarly updated tests.

Copy link
Contributor Author

@aPreciado88 aPreciado88 Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I restored the selected props.

<calcite-combobox-item id="two" value="two" text-label="two"></calcite-combobox-item>
<calcite-combobox-item id="one" value="one" text-label="one"></calcite-combobox-item>
<calcite-combobox-item selected id="two" value="two" text-label="two"></calcite-combobox-item>
<calcite-combobox-item id="three" value="three" text-label="three"></calcite-combobox-item>
</calcite-combobox>
`);
Expand All @@ -902,23 +902,23 @@ describe("calcite-combobox", () => {
await input.press("Enter");
await page.waitForChanges();

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

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

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

it("should auto-select new custom values in multiple selection mode", async () => {
const page = await newE2EPage();
await page.setContent(html`
<calcite-combobox allow-custom-values>
<calcite-combobox-item selected id="one" value="one" text-label="one"></calcite-combobox-item>
<calcite-combobox-item id="one" value="one" text-label="one"></calcite-combobox-item>
<calcite-combobox-item selected id="two" value="two" text-label="two"></calcite-combobox-item>
<calcite-combobox-item id="three" value="three" text-label="three"></calcite-combobox-item>
<calcite-combobox-item selected id="three" value="three" text-label="three"></calcite-combobox-item>
</calcite-combobox>
`);
const combobox = await page.find("calcite-combobox");
Expand All @@ -930,9 +930,9 @@ describe("calcite-combobox", () => {
await input.press("Escape");
await page.waitForChanges();

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

expect((await combobox.getProperty("selectedItems")).length).toBe(3);
Expand Down Expand Up @@ -1668,6 +1668,28 @@ describe("calcite-combobox", () => {
expect(chips.length).toBe(1);
});

it("should append unknown tag to top of list", async () => {
Copy link
Member

@jcfranco jcfranco Jul 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this test since it's already covered in the updated tests above.

const page = await newE2EPage();
await page.setContent(html`
<calcite-combobox allow-custom-values selection-mode="single">
<calcite-combobox-item id="two" value="two" text-label="two"></calcite-combobox-item>
<calcite-combobox-item id="three" value="three" text-label="three"></calcite-combobox-item>
</calcite-combobox>
`);
const input = await page.find("calcite-combobox >>> input");

await input.click();
await page.keyboard.type("one");
await input.press("Enter");
await page.waitForChanges();

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

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

it("should fire calciteComboboxChange when entering new unknown tag", async () => {
const page = await newE2EPage();
await page.setContent(html`
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