Fix/primefaces#6216 MultiSelect - SelectionLimit issue (primefaces#6218)

* fix: 6216 disabled option with selectionLimit * fix: 6216 handle selectionLimit select all * Update MultiSelect.js * Update MultiSelect.js * Update MultiSelect.js --------- Co-authored-by: Melloware <[email protected]>
shubhsaur · Apr 13, 2024 · 0a3d4e7 · 0a3d4e7
1 parent d8c7f7d
commit 0a3d4e7
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/components/lib/multiselect/MultiSelect.js b/components/lib/multiselect/MultiSelect.js
@@ -422,6 +422,11 @@ export const MultiSelect = React.memo(
                     }
                 }
 
+                // make sure not to exceed the selection limit
+                if (props.selectionLimit && value && value.length) {
+                    value = value.slice(0, props.selectionLimit);
+                }
+
                 updateModel(event.originalEvent, value, value);
             }
         };
@@ -681,11 +686,20 @@ export const MultiSelect = React.memo(
         };
 
         const isOptionDisabled = (option) => {
-            if (props.optionDisabled) {
-                return ObjectUtils.isFunction(props.optionDisabled) ? props.optionDisabled(option) : ObjectUtils.resolveFieldData(option, props.optionDisabled);
+            // disable if we have hit our selection limit
+            if (!allowOptionSelect() && !isSelected(option)) {
+                return true;
+            }
+
+            // check if custom optionDisabled function is being used
+            const { optionDisabled } = props;
+
+            if (optionDisabled) {
+                return ObjectUtils.isFunction(optionDisabled) ? optionDisabled(option) : ObjectUtils.resolveFieldData(option, optionDisabled);
             }
 
-            return option && option.disabled !== undefined ? option.disabled : false;
+            // fallback to the option itself disabled value
+            return option && (option.disabled ?? false);
         };
 
         const isOptionValueUsed = (option) => {