Merge pull request #13854 from primefaces/issue-13853

Fix #13853 - SelectButton: Add allowEmpty property
primefaces · Oct 11, 2023 · a45bc1c · a45bc1c
2 parents 0baaacc + ef1622e
commit a45bc1c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/src/app/components/selectbutton/selectbutton.ts b/src/app/components/selectbutton/selectbutton.ts
@@ -85,6 +85,11 @@ export class SelectButton implements ControlValueAccessor {
      * @group Props
      */
     @Input() multiple: boolean | undefined;
+    /**
+     * Whether selection can not be cleared.
+     * @group Props
+     */
+    @Input() allowEmpty: boolean = true;
     /**
      * Inline style of the component.
      * @group Props
@@ -174,26 +179,24 @@ export class SelectButton implements ControlValueAccessor {
 
         const optionValue = this.getOptionValue(option);
 
+        let selected = this.isSelected(option);
+
+        if (selected && !this.allowEmpty) {
+            return;
+        }
+
         if (this.multiple) {
             if (this.isSelected(option)) this.removeOption(option);
             else this.value = [...(this.value || []), optionValue];
-
-            this.onModelChange(this.value);
-
-            this.onChange.emit({
-                originalEvent: event,
-                value: this.value
-            });
-        } else if (this.value !== optionValue) {
-            this.value = optionValue;
-            this.onModelChange(this.value);
-
-            this.onChange.emit({
-                originalEvent: event,
-                value: this.value
-            });
+        } else {
+            this.value = selected ? null : optionValue;
         }
 
+        this.onModelChange(this.value);
+        this.onChange.emit({
+            originalEvent: event,
+            value: this.value
+        });
         this.onOptionClick.emit({
             originalEvent: event,
             option: option,

diff --git a/src/app/showcase/doc/apidoc/index.json b/src/app/showcase/doc/apidoc/index.json
@@ -2234,7 +2234,7 @@
                             "optional": true,
                             "readonly": false,
                             "type": "\"focus\" | \"hover\"",
-                            "description": "Event to show tooltip."
+                            "description": "Event to show the tooltip."
                         },
                         {
                             "name": "appendTo",
@@ -18592,6 +18592,14 @@
                             "default": "false",
                             "description": "When specified, allows selecting multiple values."
                         },
+                        {
+                            "name": "allowEmpty",
+                            "optional": false,
+                            "readonly": false,
+                            "type": "boolean",
+                            "default": "true",
+                            "description": "Whether selection can not be cleared."
+                        },
                         {
                             "name": "style",
                             "optional": false,