fix: Listbox: Preserve option groups while filtering.
chore: Add unit tests fixes #6233pull/6275/head
parent
90132fc104
commit
0656308149
|
@ -47,5 +47,70 @@ describe('Listbox.vue', () => {
|
||||||
|
|
||||||
expect(icon.classes()).toContain('pi-discord');
|
expect(icon.classes()).toContain('pi-discord');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should correctly filter', async () => {
|
||||||
|
await wrapper.setProps({
|
||||||
|
filter: true
|
||||||
|
});
|
||||||
|
|
||||||
|
const filterInput = wrapper.find('input.p-listbox-filter');
|
||||||
|
|
||||||
|
expect(filterInput.exists()).toBe(true);
|
||||||
|
|
||||||
|
await filterInput.setValue('is');
|
||||||
|
|
||||||
|
const options = wrapper.findAll('.p-listbox-option');
|
||||||
|
|
||||||
|
expect(options.length).toBe(2);
|
||||||
|
expect(options[0].text()).toBe('Istanbul');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should correctly filter groups', async () => {
|
||||||
|
await wrapper.setProps({
|
||||||
|
filter: true,
|
||||||
|
optionGroupLabel: 'label',
|
||||||
|
optionLabel: 'label',
|
||||||
|
optionGroupChildren: 'items',
|
||||||
|
options: [
|
||||||
|
{
|
||||||
|
label: 'Germany',
|
||||||
|
code: 'DE',
|
||||||
|
items: [
|
||||||
|
{ label: 'Berlin', value: 'Berlin' },
|
||||||
|
{ label: 'Frankfurt', value: 'Frankfurt' },
|
||||||
|
{ label: 'Hamburg', value: 'Hamburg' },
|
||||||
|
{ label: 'Munich', value: 'Munich' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'USA',
|
||||||
|
code: 'US',
|
||||||
|
items: [
|
||||||
|
{ label: 'Chicago', value: 'Chicago' },
|
||||||
|
{ label: 'Los Angeles', value: 'Los Angeles' },
|
||||||
|
{ label: 'New York', value: 'New York' },
|
||||||
|
{ label: 'San Francisco', value: 'San Francisco' }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
const filterInput = wrapper.find('input.p-listbox-filter');
|
||||||
|
|
||||||
|
expect(filterInput.exists()).toBe(true);
|
||||||
|
|
||||||
|
await filterInput.setValue('ch');
|
||||||
|
|
||||||
|
const optionGroups = wrapper.findAll('.p-listbox-option-group');
|
||||||
|
const options = wrapper.findAll('.p-listbox-option');
|
||||||
|
|
||||||
|
expect(optionGroups.length).toBe(2);
|
||||||
|
expect(optionGroups[0].text()).toBe('Germany');
|
||||||
|
expect(optionGroups[1].text()).toBe('USA');
|
||||||
|
|
||||||
|
expect(options.length).toBe(2);
|
||||||
|
expect(options[0].text()).toBe('Munich');
|
||||||
|
expect(options[1].text()).toBe('Chicago');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -726,7 +726,27 @@ export default {
|
||||||
visibleOptions() {
|
visibleOptions() {
|
||||||
const options = this.optionGroupLabel ? this.flatOptions(this.options) : this.options || [];
|
const options = this.optionGroupLabel ? this.flatOptions(this.options) : this.options || [];
|
||||||
|
|
||||||
return this.filterValue ? FilterService.filter(options, this.searchFields, this.filterValue, this.filterMatchMode, this.filterLocale) : options;
|
if (this.filterValue) {
|
||||||
|
const filteredOptions = FilterService.filter(options, this.searchFields, this.filterValue, this.filterMatchMode, this.filterLocale);
|
||||||
|
|
||||||
|
if (this.optionGroupLabel) {
|
||||||
|
const optionGroups = this.options || [];
|
||||||
|
const filtered = [];
|
||||||
|
|
||||||
|
optionGroups.forEach((group) => {
|
||||||
|
const groupChildren = this.getOptionGroupChildren(group);
|
||||||
|
const filteredItems = groupChildren.filter((item) => filteredOptions.includes(item));
|
||||||
|
|
||||||
|
if (filteredItems.length > 0) filtered.push({ ...group, [typeof this.optionGroupChildren === 'string' ? this.optionGroupChildren : 'items']: [...filteredItems] });
|
||||||
|
});
|
||||||
|
|
||||||
|
return this.flatOptions(filtered);
|
||||||
|
}
|
||||||
|
|
||||||
|
return filteredOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
return options;
|
||||||
},
|
},
|
||||||
hasSelectedOption() {
|
hasSelectedOption() {
|
||||||
return isNotEmpty(this.modelValue);
|
return isNotEmpty(this.modelValue);
|
||||||
|
|
Loading…
Reference in New Issue