Merge pull request #15477 from robGardiner01/pick-list-focus-fix

Fix PickList element selection problem after filtering with ScrollBar
primefaces · May 8, 2024 · 6f95a83 · 6f95a83
2 parents a5471a9 + 4de97a6
commit 6f95a83
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/app/components/picklist/picklist.ts b/src/app/components/picklist/picklist.ts
@@ -1326,11 +1326,12 @@ export class PickList implements AfterViewChecked, AfterContentInit {
         let listElement = this.getListElement(listType);
         const selectedFirstItem = DomHandler.findSingle(listElement, 'li.p-picklist-item.p-highlight') || DomHandler.findSingle(listElement, 'li.p-picklist-item');
         const findIndex = ObjectUtils.findIndexInList(selectedFirstItem, listElement.children);
-
         this.focused[listType === this.SOURCE_LIST ? 'sourceList' : 'targetList'] = true;
-        const index = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : selectedFirstItem ? findIndex : -1;
 
-        this.changeFocusedOptionIndex(index, listType);
+        const sourceIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : selectedFirstItem ? findIndex : -1;
+        const filteredIndex = this.findIndexInList(this.source[sourceIndex], this.visibleOptionsSource);
+
+        this.changeFocusedOptionIndex(filteredIndex, listType);
         this.onFocus.emit(event);
     }