Skip to content

feat(combobox-item): update interactive state #11647

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
anveshmekala merged 7 commits into from
Mar 10, 2025
Merged

feat(combobox-item): update interactive state #11647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1436515
fix(combobox-item): interactive states update color of shortHeading p…
anveshmekala Feb 27, 2025
61ce9b9
refactor
anveshmekala Feb 28, 2025
8a0fc50
update test
anveshmekala Feb 28, 2025
33f0fcd
revert icon styles when selected
anveshmekala Feb 28, 2025
04779a5
fix slotted icon color when selected
anveshmekala Mar 1, 2025
7578d67
remove hover styles for heading, description & title
anveshmekala Mar 6, 2025
8b465ba
tidy up
anveshmekala Mar 6, 2025
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
62 changes: 30 additions & 32 deletions packages/calcite-components/src/components/combobox-item/combobox-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,22 @@ ul:focus {
@apply cursor-default;
}

// selected state
.label--selected {
@apply text-color-1;

.title {
@apply font-medium;
}
}

.label--active {
@apply focus-inset;
}

.label:hover,
:host([selected]) .label,
.label:active {
@apply text-color-1
bg-foreground-2
no-underline
shadow-none;
@apply text-color-1;

.description,
.short-text {
@apply text-color-2;
}
}

.label:hover {
@apply text-color-1 bg-foreground-2;
}

.label:active {
Expand All @@ -101,22 +98,17 @@ ul:focus {
opacity-0
duration-150
ease-in-out;
color: theme("borderColor.color.1");
}

.icon--custom {
margin-block-start: -1px;
}

.icon--selected {
@apply text-color-1;
}

.label--selected .icon {
:host([selected]) .icon {
@apply opacity-100;
color: theme("backgroundColor.brand");
}

.icon--custom {
margin-block-start: -1px;
}

.center-content {
display: flex;
flex-direction: column;
Expand All @@ -128,22 +120,28 @@ ul:focus {
font-size: var(--calcite-internal-combobox-item-description-font-size);
}

:host([selected]),
:host(:hover) {
.description {
color: var(--calcite-color-text-2);
}
}

.short-text {
color: var(--calcite-color-text-3);
white-space: nowrap;
}

.title {
color: var(--calcite-color-text-1);
}

:host([selected]) {
.title {
@apply font-medium;
}
}

.label,
.label:hover {
.description,
.short-text {
@apply text-color-3;
}
}

.title,
.description,
.short-text {
Expand Down
3 changes: 0 additions & 3 deletions packages/calcite-components/src/components/combobox-item/combobox-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ export class ComboboxItem extends LitElement implements InteractiveComponent {
<calcite-icon
class={{
[CSS.custom]: !!this.icon,
[CSS.iconSelected]: this.icon && this.selected,
}}
flipRtl={this.iconFlipRtl}
icon={this.icon || iconPath}
Expand All @@ -251,7 +250,6 @@ export class ComboboxItem extends LitElement implements InteractiveComponent {
<calcite-icon
class={{
[CSS.icon]: true,
[CSS.iconSelected]: this.selected,
}}
flipRtl={this.iconFlipRtl}
icon={icon}
Expand Down Expand Up @@ -288,7 +286,6 @@ export class ComboboxItem extends LitElement implements InteractiveComponent {

const classes = {
[CSS.label]: true,
[CSS.selected]: this.selected,
[CSS.active]: this.active,
[CSS.single]: isSingleSelect,
};
Expand Down
2 changes: 0 additions & 2 deletions packages/calcite-components/src/components/combobox-item/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ export const CSS = {
custom: "icon--custom",
description: "description",
icon: "icon",
iconSelected: "icon--selected",
label: "label",
scale: (scale: Scale) => `scale--${scale}` as const,
selected: "label--selected",
shortText: "short-text",
single: "label--single",
textContainer: "text-container",
Expand Down
7 changes: 5 additions & 2 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 @@ -2099,12 +2099,15 @@ describe("calcite-combobox", () => {
it("after click interaction with listbox, user can transition to using keyboard “enter” to toggle selected on/off", async () => {
expect(itemNestedLi).toHaveClass(ComboboxItemCSS.active);

const selectedItem = await page.find("calcite-combobox-item#PineNested");
expect(await selectedItem.getProperty("selected")).toBe(true);

await itemNestedLi.press("Enter");
expect(itemNestedLi).not.toHaveClass(ComboboxItemCSS.selected);
expect(await selectedItem.getProperty("selected")).toBe(false);
expect(itemNestedLi).toHaveClass(ComboboxItemCSS.active);

await itemNestedLi.press("Enter");
expect(itemNestedLi).toHaveClass(ComboboxItemCSS.selected);
expect(await selectedItem.getProperty("selected")).toBe(true);
expect(itemNestedLi).toHaveClass(ComboboxItemCSS.active);

await element.press("Tab");
Expand Down