Fix primefaces#6822: Refactor Dropdown.js to improve optionLabel and …

…optionValue retrieval
Rekl0w · Jul 4, 2024 · 2c6cc14 · 2c6cc14
1 parent 9163fd0
commit 2c6cc14
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js
@@ -886,13 +886,13 @@ export const Dropdown = React.memo(
         };
 
         const getOptionLabel = (option) => {
-            const optionLabel = props.optionLabel ? ObjectUtils.resolveFieldData(option, props.optionLabel) : ObjectUtils.resolveFieldData(option, 'label');
+            const optionLabel = props.optionLabel ? ObjectUtils.resolveFieldData(option, props.optionLabel) : option ? option['label'] : ObjectUtils.resolveFieldData(option, 'label')
 
             return ObjectUtils.isNotEmpty(optionLabel) ? optionLabel : option;
         };
 
         const getOptionValue = (option) => {
-            const optionValue = props.OptionValue ? ObjectUtils.resolveFieldData(option, props.optionValue) : ObjectUtils.resolveFieldData(option, 'value');
+            const optionValue = props.optionValue ? ObjectUtils.resolveFieldData(option, props.optionValue) : option ? option['value'] : ObjectUtils.resolveFieldData(option, 'value')
 
             return ObjectUtils.isNotEmpty(optionValue) ? optionValue : option;
         };