Merge pull request #1401 from Amadey666/master

Fixed #1397 - duplicate key error in listbox and dropdown
primefaces · Jun 24, 2020 · b162ac8 · b162ac8
2 parents 4047cc3 + 7a44453
commit b162ac8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/dropdown/Dropdown.js b/src/components/dropdown/Dropdown.js
@@ -616,10 +616,12 @@ export class Dropdown extends Component {
         }
 
         if (items) {
-            return items.map((option) => {
+            return items.map((option, index) => {
                 let optionLabel = this.getOptionLabel(option);
+                let optionKey = this.getOptionKey(option, index);
+
                 return (
-                    <DropdownItem key={this.getOptionKey(option)} label={optionLabel} option={option} template={this.props.itemTemplate} selected={selectedOption === option} disabled={option.disabled} onClick={this.onOptionClick} />
+                    <DropdownItem key={optionKey} label={optionLabel} option={option} template={this.props.itemTemplate} selected={selectedOption === option} disabled={option.disabled} onClick={this.onOptionClick} />
                 );
             });
         }
@@ -649,8 +651,8 @@ export class Dropdown extends Component {
         return this.props.optionValue ? ObjectUtils.resolveFieldData(option, this.props.optionValue) : (option['value'] !== undefined ? option['value'] : option);
     }
 
-    getOptionKey(option) {
-        return this.props.dataKey ? ObjectUtils.resolveFieldData(option, this.props.dataKey) : this.getOptionLabel(option);
+    getOptionKey(option, index) {
+        return this.props.dataKey ? ObjectUtils.resolveFieldData(option, this.props.dataKey) : `pr_id__${this.getOptionLabel}-${index}`;
     }
 
     checkValidity() {

diff --git a/src/components/listbox/ListBox.js b/src/components/listbox/ListBox.js
@@ -278,9 +278,10 @@ export class ListBox extends Component {
 
             items = items.map((option, index) => {
                 let optionLabel = this.getOptionLabel(option);
+                let optionKey = `pr_id__${optionLabel}-${index}`;
 
                 return (
-                    <ListBoxItem key={optionLabel} label={optionLabel} option={option} template={this.props.itemTemplate} selected={this.isSelected(option)}
+                    <ListBoxItem key={optionKey} label={optionLabel} option={option} template={this.props.itemTemplate} selected={this.isSelected(option)}
                         onClick={this.onOptionClick} onTouchEnd={(e) => this.onOptionTouchEnd(e, option, index)} tabIndex={this.props.tabIndex} />
                 );
             });