From 96e23250ca461026d4300fb625f70d7ae4c6357b Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Fri, 18 Oct 2024 16:41:44 +0100
Subject: [PATCH] Add form support to `Checkbox`

---
 .../primevue/src/checkbox/BaseCheckbox.vue    | 21 ++-----------------
 packages/primevue/src/checkbox/Checkbox.vue   | 11 +++++-----
 .../src/checkbox/style/CheckboxStyle.js       |  4 ++--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/packages/primevue/src/checkbox/BaseCheckbox.vue b/packages/primevue/src/checkbox/BaseCheckbox.vue
index bac9c3519..9b456c49b 100644
--- a/packages/primevue/src/checkbox/BaseCheckbox.vue
+++ b/packages/primevue/src/checkbox/BaseCheckbox.vue
@@ -1,18 +1,13 @@
 <script>
-import BaseComponent from '@primevue/core/basecomponent';
+import BaseInput from '@primevue/core/baseinput';
 import CheckboxStyle from 'primevue/checkbox/style';
 
 export default {
     name: 'BaseCheckbox',
-    extends: BaseComponent,
+    extends: BaseInput,
     props: {
         value: null,
-        modelValue: null,
         binary: Boolean,
-        name: {
-            type: String,
-            default: null
-        },
         indeterminate: {
             type: Boolean,
             default: false
@@ -25,18 +20,6 @@ export default {
             type: null,
             default: false
         },
-        variant: {
-            type: String,
-            default: null
-        },
-        invalid: {
-            type: Boolean,
-            default: false
-        },
-        disabled: {
-            type: Boolean,
-            default: false
-        },
         readonly: {
             type: Boolean,
             default: false
diff --git a/packages/primevue/src/checkbox/Checkbox.vue b/packages/primevue/src/checkbox/Checkbox.vue
index 3fa069d3c..670beb2ad 100755
--- a/packages/primevue/src/checkbox/Checkbox.vue
+++ b/packages/primevue/src/checkbox/Checkbox.vue
@@ -40,7 +40,7 @@ export default {
     name: 'Checkbox',
     extends: BaseCheckbox,
     inheritAttrs: false,
-    emits: ['update:modelValue', 'change', 'focus', 'blur', 'update:indeterminate'],
+    emits: ['change', 'focus', 'blur', 'update:indeterminate'],
     data() {
         return {
             d_indeterminate: this.indeterminate
@@ -70,8 +70,8 @@ export default {
                 if (this.binary) {
                     newModelValue = this.d_indeterminate ? this.trueValue : this.checked ? this.falseValue : this.trueValue;
                 } else {
-                    if (this.checked || this.d_indeterminate) newModelValue = this.modelValue.filter((val) => !equals(val, this.value));
-                    else newModelValue = this.modelValue ? [...this.modelValue, this.value] : [this.value];
+                    if (this.checked || this.d_indeterminate) newModelValue = this.d_value.filter((val) => !equals(val, this.value));
+                    else newModelValue = this.d_value ? [...this.d_value, this.value] : [this.value];
                 }
 
                 if (this.d_indeterminate) {
@@ -79,7 +79,7 @@ export default {
                     this.$emit('update:indeterminate', this.d_indeterminate);
                 }
 
-                this.$emit('update:modelValue', newModelValue);
+                this.updateValue(newModelValue, event);
                 this.$emit('change', event);
             }
         },
@@ -88,11 +88,12 @@ export default {
         },
         onBlur(event) {
             this.$emit('blur', event);
+            this.formField.onBlur?.(event);
         }
     },
     computed: {
         checked() {
-            return this.d_indeterminate ? false : this.binary ? this.modelValue === this.trueValue : contains(this.value, this.modelValue);
+            return this.d_indeterminate ? false : this.binary ? this.d_value === this.trueValue : contains(this.value, this.d_value);
         }
     },
     components: {
diff --git a/packages/primevue/src/checkbox/style/CheckboxStyle.js b/packages/primevue/src/checkbox/style/CheckboxStyle.js
index 6f4cdb148..3f39e54d4 100644
--- a/packages/primevue/src/checkbox/style/CheckboxStyle.js
+++ b/packages/primevue/src/checkbox/style/CheckboxStyle.js
@@ -120,8 +120,8 @@ const classes = {
         {
             'p-checkbox-checked': instance.checked,
             'p-disabled': props.disabled,
-            'p-invalid': props.invalid,
-            'p-variant-filled': props.variant ? props.variant === 'filled' : instance.$primevue.config.inputStyle === 'filled' || instance.$primevue.config.inputVariant === 'filled'
+            'p-invalid': instance.$invalid,
+            'p-variant-filled': instance.$variant === 'filled'
         }
     ],
     box: 'p-checkbox-box',