Fix primefaces#6550: dropdown filter fix (primefaces#6551)

* Fix primefaces#6550: dropdown filter fix * Revert "Fix primefaces#6550: dropdown filter fix" This reverts commit 1c45d79. * Fix primefaces#6550: dropdown filter fix update * Revert "Fix primefaces#6550: dropdown filter fix update" This reverts commit e7b020e. * Fix primefaces#6550: dropdown filter fix update
melloware · May 2, 2024 · 7312fe4 · 7312fe4
1 parent db845e6
commit 7312fe4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js
@@ -557,7 +557,10 @@ export const Dropdown = React.memo(
                 if (option) {
                     return option;
                 } else if (groupIndex > 0) {
-                    return findPrevOption({ group: groupIndex - 1, option: getOptionGroupChildren(visibleOptions[groupIndex - 1]).length });
+                    return findPrevOption({
+                        group: groupIndex - 1,
+                        option: getOptionGroupChildren(visibleOptions[groupIndex - 1]).length
+                    });
                 }
 
                 return null;
@@ -887,7 +890,7 @@ export const Dropdown = React.memo(
         };
 
         const getOptionValue = (option) => {
-            return props.optionValue ? ObjectUtils.resolveFieldData(option, props.optionValue) : option;
+            return props.optionValue ? ObjectUtils.resolveFieldData(option, props.optionValue) : ObjectUtils.resolveFieldData(option, 'value') || option;
         };
 
         const getOptionRenderKey = (option) => {