From 2c6cc141f8e2879d229e45aa8fe48213ea76880f Mon Sep 17 00:00:00 2001 From: Batuhan Tomo Date: Thu, 4 Jul 2024 12:20:43 +0300 Subject: [PATCH 1/2] Fix #6822: Refactor Dropdown.js to improve optionLabel and optionValue retrieval --- components/lib/dropdown/Dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js index 804edc9a33..c40df9aff9 100644 --- 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; }; From 5b7756e8eb3da6013c6890b2eeddef4ca1032b5d Mon Sep 17 00:00:00 2001 From: Batuhan Tomo Date: Thu, 4 Jul 2024 12:26:55 +0300 Subject: [PATCH 2/2] Refactor Dropdown.js to improve optionLabel and optionValue retrieval --- components/lib/dropdown/Dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js index c40df9aff9..77e531c121 100644 --- 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) : option ? option['label'] : 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) : option ? option['value'] : 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; };