Skip to content

feat(combo): fix initial combo height #16161

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
merged 15 commits into from
Sep 2, 2025
Merged

feat(combo): fix initial combo height #16161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b53d2f3
feat(combo): fix initial combo height
didimmova Aug 21, 2025
78832ca
test(combo): try fixing tests
didimmova Aug 21, 2025
98b87d8
Merge branch 'master' into didimmova/fix-combo-initial-height-master
didimmova Aug 21, 2025
87bb91f
test(simple-combo): fix simple combo default max height
didimmova Aug 21, 2025
f6d2e2c
Merge branch 'master' into didimmova/fix-combo-initial-height-master
simeonoff Aug 21, 2025
5a2edf1
Merge branch 'master' into didimmova/fix-combo-initial-height-master
didimmova Aug 22, 2025
b17b327
test(combo): fix more tests
didimmova Aug 22, 2025
13c8c52
test(simple-combo): fix simple combo test
didimmova Aug 22, 2025
d68b49c
chore(test): remove fdescribe
didimmova Aug 22, 2025
a5cae96
feat(combo): fix indigo dropdown initial height
didimmova Aug 25, 2025
4f902da
feat(combo): fix indigo initial combo height
didimmova Aug 25, 2025
4ce7fd4
Merge branch 'master' into didimmova/fix-combo-initial-height-master
didimmova Aug 25, 2025
a89758a
Merge branch 'master' into didimmova/fix-combo-initial-height-master
desig9stein Aug 28, 2025
ad179c9
refactor(combo): use CSS variable to set item count
simeonoff Sep 2, 2025
a439ed7
Merge branch 'master' into didimmova/fix-combo-initial-height-master
simeonoff Sep 2, 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
58 changes: 28 additions & 30 deletions projects/igniteui-angular/src/lib/combo/combo.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const CSS_CLASS_EMPTY = 'igx-combo__empty';
const CSS_CLASS_ITEM_CHECKBOX = 'igx-combo__checkbox';
const CSS_CLASS_ITME_CHECKBOX_CHECKED = 'igx-checkbox--checked';
const defaultDropdownItemHeight = 40;
const defaultDropdownItemMaxHeight = 400;
const defaultDropdownItemMaxHeight = 240;

describe('igxCombo', () => {
let fixture: ComponentFixture<any>;
Expand Down Expand Up @@ -1195,17 +1195,18 @@ describe('igxCombo', () => {
it('should render selected items properly', () => {
combo.toggle();
fixture.detectChanges();

const dropdownList = fixture.debugElement.query(By.css(`.${CSS_CLASS_DROPDOWNLIST_SCROLL}`)).nativeElement;
const dropdownItems = dropdownList.querySelectorAll(`.${CSS_CLASS_DROPDOWNLISTITEM}`);


expect(dropdownItems[1].classList.contains(CSS_CLASS_SELECTED)).toBeFalsy();
expect(dropdownItems[3].classList.contains(CSS_CLASS_SELECTED)).toBeFalsy();
expect(dropdownItems[7].classList.contains(CSS_CLASS_SELECTED)).toBeFalsy();

combo.select(['Illinois', 'Mississippi', 'Ohio']);
combo.select(['Illinois', 'Ohio']);
fixture.detectChanges();
expect(dropdownItems[1].classList.contains(CSS_CLASS_SELECTED)).toBeTruthy();
expect(dropdownItems[3].classList.contains(CSS_CLASS_SELECTED)).toBeTruthy();
expect(dropdownItems[7].classList.contains(CSS_CLASS_SELECTED)).toBeTruthy();

combo.deselect(['Ohio']);
fixture.detectChanges();
Expand All @@ -1225,9 +1226,9 @@ describe('igxCombo', () => {
expect(focusedItem_1.classList.contains(CSS_CLASS_FOCUSED)).toBeTruthy();

// Change focus
dropdown.navigateItem(6);
dropdown.navigateItem(4);
fixture.detectChanges();
const focusedItem_2 = dropdownItems[5];
const focusedItem_2 = dropdownItems[3];
expect(focusedItem_2.classList.contains(CSS_CLASS_FOCUSED)).toBeTruthy();
expect(focusedItem_1.classList.contains(CSS_CLASS_FOCUSED)).toBeFalsy();
});
Expand Down Expand Up @@ -1772,7 +1773,7 @@ describe('igxCombo', () => {
dropdown.toggle();
fixture.detectChanges();
expect(dropdown.items).toBeDefined();
expect(dropdown.items.length).toEqual(9);
expect(dropdown.items.length).toEqual(5);
dropdown.onFocus();
expect(dropdown.focusedItem).toEqual(dropdown.items[0]);
expect(dropdown.focusedItem.focused).toEqual(true);
Expand Down Expand Up @@ -1894,17 +1895,17 @@ describe('igxCombo', () => {
selectedItemsCount++;
selectAndVerifyItem(0);

for (let index = 1; index < 7; index++) {
for (let index = 1; index < 5; index++) {
focusAndVerifyItem(index, 'ArrowDown');
}
selectedItemsCount++;
selectAndVerifyItem(6);
selectAndVerifyItem(4);

for (let index = 5; index > 3; index--) {
for (let index = 3; index >= 2; index--) {
focusAndVerifyItem(index, 'ArrowUp');
}
selectedItemsCount++;
selectAndVerifyItem(4);
selectAndVerifyItem(2);
});
it('should properly navigate using HOME/END key', (async () => {
let firstVisibleItem: Element;
Expand Down Expand Up @@ -2072,7 +2073,7 @@ describe('igxCombo', () => {
const scrollbar = fixture.debugElement.query(By.css(`.${CSS_CLASS_SCROLLBAR_VERTICAL}`)).nativeElement as HTMLElement;
expect(scrollbar.scrollTop).toEqual(0);

combo.virtualScrollContainer.scrollTo(16);
combo.virtualScrollContainer.scrollTo(12);
await firstValueFrom(combo.virtualScrollContainer.chunkLoad);
fixture.detectChanges();
let selectedItem = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_DROPDOWNLISTITEM}`))[1];
Expand All @@ -2088,7 +2089,7 @@ describe('igxCombo', () => {
// Content was scrolled to bottom
expect(scrollbar.scrollHeight - scrollbar.scrollTop).toEqual(scrollbar.clientHeight);

combo.virtualScrollContainer.scrollTo(5);
combo.virtualScrollContainer.scrollTo(4);
await firstValueFrom(combo.virtualScrollContainer.chunkLoad);
fixture.detectChanges();
selectedItem = fixture.debugElement.query(By.css(`.${CSS_CLASS_SELECTED}`));
Expand Down Expand Up @@ -2163,15 +2164,14 @@ describe('igxCombo', () => {
expect(input.nativeElement.value).toEqual(expectedOutput);
});
it('should dismiss all selected items by pressing clear button', () => {
const expectedOutput = 'Kentucky, Ohio, Indiana';
combo.select(['Kentucky', 'Ohio', 'Indiana']);
const expectedOutput = 'Ohio, Indiana';
combo.select(['Ohio', 'Indiana']);
fixture.detectChanges();
expect(input.nativeElement.value).toEqual(expectedOutput);
combo.toggle();
fixture.detectChanges();
expect(combo.dropdown.items[1].selected).toBeTruthy();
expect(combo.dropdown.items[4].selected).toBeTruthy();
expect(combo.dropdown.items[6].selected).toBeTruthy();

const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
clearBtn.triggerEventHandler('click', UIInteractions.getMouseEvent('click'));
Expand All @@ -2184,7 +2184,6 @@ describe('igxCombo', () => {
fixture.detectChanges();
expect(combo.dropdown.items[1].selected).toBeFalsy();
expect(combo.dropdown.items[4].selected).toBeFalsy();
expect(combo.dropdown.items[6].selected).toBeFalsy();
});
it('should show/hide clear button after selecting/deselecting items', () => {
// This is a workaround for issue github.com/angular/angular/issues/14235
Expand Down Expand Up @@ -2242,8 +2241,8 @@ describe('igxCombo', () => {
cancel: false
});

const selectedItem_2 = dropdown.items[5];
simulateComboItemClick(5);
const selectedItem_2 = dropdown.items[4];
simulateComboItemClick(4);
expect(combo.selection[1]).toEqual(selectedItem_2.value);
expect(combo.value[1]).toEqual(selectedItem_2.value[combo.valueKey]);
expect(selectedItem_2.selected).toBeTruthy();
Expand Down Expand Up @@ -2691,19 +2690,19 @@ describe('igxCombo', () => {
combo.toggle();
fixture.detectChanges();
let headers = combo.dropdown.headers.map(header => header.element.nativeElement.innerText);
expect(headers).toEqual(['Ángel', 'Boris', 'México', 'Méxícó']);
expect(headers).toEqual(['Ángel', 'Boris', 'México']);

combo.groupSortingDirection = SortingDirection.Desc;
combo.toggle();
fixture.detectChanges();
headers = combo.dropdown.headers.map(header => header.element.nativeElement.innerText);
expect(headers).toEqual(['Méxícó', 'México', 'Boris', 'Ángel']);
expect(headers).toEqual(['Méxícó', 'México', 'Boris']);

combo.groupSortingDirection = SortingDirection.None;
combo.toggle();
fixture.detectChanges();
headers = combo.dropdown.headers.map(header => header.element.nativeElement.innerText);
expect(headers).toEqual(['Méxícó', 'Ángel', 'México', 'Boris']);
expect(headers).toEqual(['Méxícó', 'Ángel', 'México']);
});
});
describe('Filtering tests: ', () => {
Expand Down Expand Up @@ -2862,8 +2861,8 @@ describe('igxCombo', () => {

verifyFilteredItems('jose', 1);
verifyFilteredItems('mexico', 3);
verifyFilteredItems('o', 7);
verifyFilteredItems('é', 7);
verifyFilteredItems('o', 6);
verifyFilteredItems('é', 6);
}));

it('should filter the dropdown items when typing in the search input', fakeAsync(() => {
Expand All @@ -2888,9 +2887,9 @@ describe('igxCombo', () => {
dropdownItems = dropdownList.querySelectorAll(`.${CSS_CLASS_DROPDOWNLISTITEM}`);
expect(dropdownItems.length).toEqual(expectedItemsNumber);
};
verifyFilteredItems('M', 7);
verifyFilteredItems('M', 4);

verifyFilteredItems('Mi', 5);
verifyFilteredItems('Mi', 3);
expectedValues = expectedValues.filter(data => data.field.toLowerCase().includes('mi'));
checkFilteredItems(dropdownItems);

Expand Down Expand Up @@ -2960,9 +2959,9 @@ describe('igxCombo', () => {
expect(combo.filteredData.length).toEqual(expectedFilteredItemsNumber);
};

verifyFilteredItems('M', 7, 15);
verifyFilteredItems('Mi', 5, 5);
verifyFilteredItems('M', 7, 15);
verifyFilteredItems('M', 4, 15);
verifyFilteredItems('Mi', 3, 5);
verifyFilteredItems('M', 4, 15);
combo.filteredData.forEach((item) => expect(combo.data).toContain(item));
});
it('should clear the search input and close the dropdown list on pressing ESC key', fakeAsync(() => {
Expand Down Expand Up @@ -3768,7 +3767,6 @@ class IgxComboFormComponent {
password: ['', Validators.required],
townCombo: [[this.items[0]], Validators.required]
});

}
public onSubmitReactive() { }

Expand Down
8 changes: 7 additions & 1 deletion projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,15 @@
}

%igx-combo__content {
--item-count: 6;

position: relative;
overflow: hidden;
max-height: calc(var(--size) * 10);
max-height: calc(var(--size) * var(--item-count));

@if $variant == 'indigo' {
max-height: calc(var(--size) * var(--item-count) + rem(16px));
}

&:focus {
outline: transparent;
Expand Down
6 changes: 3 additions & 3 deletions projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const CSS_CLASS_FOOTER = 'footer-class';
const CSS_CLASS_INPUT_GROUP_REQUIRED = 'igx-input-group--required';
const CSS_CLASS_INPUT_GROUP_INVALID = 'igx-input-group--invalid';
const defaultDropdownItemHeight = 40;
const defaultDropdownItemMaxHeight = 400;
const defaultDropdownItemMaxHeight = 240;

describe('IgxSimpleCombo', () => {
let fixture: ComponentFixture<any>;
Expand Down Expand Up @@ -720,9 +720,9 @@ describe('IgxSimpleCombo', () => {
expect(focusedItem_1.classList.contains(CSS_CLASS_FOCUSED)).toBeTruthy();

// Change focus
dropdown.navigateItem(6);
dropdown.navigateItem(5);
fixture.detectChanges();
const focusedItem_2 = dropdownItems[5];
const focusedItem_2 = dropdownItems[4];
expect(focusedItem_2.classList.contains(CSS_CLASS_FOCUSED)).toBeTruthy();
expect(focusedItem_1.classList.contains(CSS_CLASS_FOCUSED)).toBeFalsy();
});
Expand Down
Loading