fix: flatOptions on Dropdown causing option group label blank (primef…

…aces#7296) * fix: flatOptions on Dropdown causing option group label blank * remove: optionGroup. To determine if an option is a group, it is sufficient to use the group and optionGroupLabel properties
melloware · Oct 2, 2024 · 06f6231 · 06f6231
1 parent db99bda
commit 06f6231
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js
@@ -59,7 +59,7 @@ export const Dropdown = React.memo(
 
         const flatOptions = (options) => {
             return (options || []).reduce((result, option, index) => {
-                result.push({ optionGroup: option, group: true, index, code: option.code, label: option.label });
+                result.push({ ...option, group: true, index });
 
                 const optionGroupChildren = getOptionGroupChildren(option);
 
@@ -846,7 +846,7 @@ export const Dropdown = React.memo(
         };
 
         const isOptionGroup = (option) => {
-            return props.optionGroupLabel && option.optionGroup && option.group;
+            return props.optionGroupLabel && option.group;
         };
 
         const isOptionDisabled = (option) => {

diff --git a/components/lib/dropdown/DropdownPanel.js b/components/lib/dropdown/DropdownPanel.js
@@ -93,7 +93,7 @@ export const DropdownPanel = React.memo(
 
             style = { ...style, ...option.style };
 
-            if (option.group && option.optionGroup && props.optionGroupLabel) {
+            if (option.group && props.optionGroupLabel) {
                 const { optionGroupLabel } = props;
                 const groupContent = props.optionGroupTemplate ? ObjectUtils.getJSXElement(props.optionGroupTemplate, option, index) : props.getOptionGroupLabel(option);
                 const key = index + '_' + props.getOptionGroupRenderKey(option);