Fix #2306 - Dropdown with filter bug selecting with arrow keys

primefaces · Sep 21, 2021 · be8b757 · be8b757
1 parent 606e9ff
commit be8b757
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/components/dropdown/Dropdown.js b/src/components/dropdown/Dropdown.js
@@ -578,21 +578,25 @@ export class Dropdown extends Component {
 
     getSelectedOption() {
         let index = this.getSelectedOptionIndex();
-        return index !== -1 ? (this.props.optionGroupLabel ? this.getOptionGroupChildren(this.props.options[index.group])[index.option] : this.props.options[index]) : null;
+        let visibleOptions = this.getVisibleOptions()
+
+        return index !== -1 ? (this.props.optionGroupLabel ? this.getOptionGroupChildren(visibleOptions[index.group])[index.option] : visibleOptions[index]) : null;
     }
 
     getSelectedOptionIndex() {
-        if (this.props.value != null && this.props.options) {
+        let visibleOptions = this.getVisibleOptions()
+
+        if (this.props.value != null && visibleOptions) {
             if (this.props.optionGroupLabel) {
-                for (let i = 0; i < this.props.options.length; i++) {
-                    let selectedOptionIndex = this.findOptionIndexInList(this.props.value, this.getOptionGroupChildren(this.props.options[i]));
+                for (let i = 0; i < visibleOptions.length; i++) {
+                    let selectedOptionIndex = this.findOptionIndexInList(this.props.value, this.getOptionGroupChildren(visibleOptions[i]));
                     if (selectedOptionIndex !== -1) {
                         return { group: i, option: selectedOptionIndex };
                     }
                 }
             }
             else {
-                return this.findOptionIndexInList(this.props.value, this.props.options);
+                return this.findOptionIndexInList(this.props.value, visibleOptions);
             }
         }