Merge pull request #5915 from gucal/master

Fix #5914 - MultiSelect: Enter | Space Overlay Closes
primefaces · Feb 7, 2024 · 5c8d402 · 5c8d402
2 parents 46742d5 + 2cd67b8
commit 5c8d402
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/components/lib/multiselect/MultiSelect.js b/components/lib/multiselect/MultiSelect.js
@@ -208,8 +208,6 @@ export const MultiSelect = React.memo(
                     if (event.shiftKey) onOptionSelectRange(event, focusedOptionIndex);
                     else onOptionSelect(event, visibleOptions[focusedOptionIndex]);
                 }
-
-                hide();
             }
 
             event.preventDefault();
@@ -535,6 +533,10 @@ export const MultiSelect = React.memo(
             return list.findIndex((item) => value.some((val) => ObjectUtils.equals(val, getOptionValue(item), equalityKey)));
         };
 
+        const isEquals = (value1, value2) => {
+            return ObjectUtils.equals(value1, value2, equalityKey);
+        };
+
         const isSelected = (option) => {
             if (props.value) {
                 const optionValue = getOptionValue(option);
@@ -687,7 +689,16 @@ export const MultiSelect = React.memo(
         };
 
         const findSelectedOptionIndex = () => {
-            return hasSelectedOption ? visibleOptions?.findIndex((option) => isValidSelectedOption(option)) : -1;
+            if (hasSelectedOption()) {
+                for (let index = props.value.length - 1; index >= 0; index--) {
+                    const value = props.value[index];
+                    const matchedOptionIndex = visibleOptions.findIndex((option) => isValidSelectedOption(option) && isEquals(value, getOptionValue(option)));
+
+                    if (matchedOptionIndex > -1) return matchedOptionIndex;
+                }
+            }
+
+            return -1;
         };
 
         const findFirstFocusedOptionIndex = () => {