fix: visibleOptions respecting optionGroupChildren (#3804)

primefaces · Mar 27, 2023 · ad6b710 · ad6b710
1 parent ac0aad6
commit ad6b710
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/components/lib/dropdown/Dropdown.vue b/components/lib/dropdown/Dropdown.vue
@@ -978,9 +978,10 @@ export default {
                     const filtered = [];
 
                     optionGroups.forEach((group) => {
-                        const filteredItems = group.items.filter((item) => filteredOptions.includes(item));
+                        const groupChildren = this.getOptionGroupChildren(group);
+                        const filteredItems = groupChildren.filter((item) => filteredOptions.includes(item));
 
-                        if (filteredItems.length > 0) filtered.push({ ...group, items: [...filteredItems] });
+                        if (filteredItems.length > 0) filtered.push({ ...group, [typeof this.optionGroupChildren === 'string' ? this.optionGroupChildren : 'items']: [...filteredItems] });
                     });
 
                     return this.flatOptions(filtered);

diff --git a/components/lib/multiselect/MultiSelect.vue b/components/lib/multiselect/MultiSelect.vue
@@ -1093,9 +1093,10 @@ export default {
                     const filtered = [];
 
                     optionGroups.forEach((group) => {
-                        const filteredItems = group.items.filter((item) => filteredOptions.includes(item));
+                        const groupChildren = this.getOptionGroupChildren(group);
+                        const filteredItems = groupChildren.filter((item) => filteredOptions.includes(item));
 
-                        if (filteredItems.length > 0) filtered.push({ ...group, items: [...filteredItems] });
+                        if (filteredItems.length > 0) filtered.push({ ...group, [typeof this.optionGroupChildren === 'string' ? this.optionGroupChildren : 'items']: [...filteredItems] });
                     });
 
                     return this.flatOptions(filtered);