From ba305c1886e9b8fe5f7104f7527ff23276fb150f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Wed, 24 May 2023 14:53:22 +0300
Subject: [PATCH] Refactor #3965 - For Checkbox

---
 components/lib/checkbox/BaseCheckbox.vue | 120 +++++++++++++++++++++++
 components/lib/checkbox/Checkbox.d.ts    |   9 ++
 components/lib/checkbox/Checkbox.vue     |  81 ++-------------
 3 files changed, 136 insertions(+), 74 deletions(-)
 create mode 100644 components/lib/checkbox/BaseCheckbox.vue

diff --git a/components/lib/checkbox/BaseCheckbox.vue b/components/lib/checkbox/BaseCheckbox.vue
new file mode 100644
index 000000000..35c96539e
--- /dev/null
+++ b/components/lib/checkbox/BaseCheckbox.vue
@@ -0,0 +1,120 @@
+<script>
+import BaseComponent from 'primevue/basecomponent';
+import { useStyle } from 'primevue/usestyle';
+
+const styles = `
+.p-checkbox {
+    display: inline-flex;
+    cursor: pointer;
+    user-select: none;
+    vertical-align: bottom;
+    position: relative;
+}
+
+.p-checkbox.p-checkbox-disabled {
+    cursor: default;
+}
+
+.p-checkbox-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+`;
+
+const classes = {
+    root: ({ instance, props }) => [
+        'p-checkbox p-component',
+        {
+            'p-checkbox-checked': instance.checked,
+            'p-checkbox-disabled': props.disabled,
+            'p-checkbox-focused': instance.focused
+        }
+    ],
+    hiddenInputWrapper: 'p-hidden-accessible',
+    input: ({ instance, props }) => [
+        'p-checkbox-box',
+        {
+            'p-highlight': instance.checked,
+            'p-disabled': props.disabled,
+            'p-focus': instance.focused
+        }
+    ],
+    icon: 'p-checkbox-icon'
+};
+
+const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_checkbox_style', manual: true });
+
+export default {
+    name: 'BaseCheckbox',
+    extends: BaseComponent,
+    props: {
+        value: null,
+        modelValue: null,
+        binary: Boolean,
+        name: {
+            type: String,
+            default: null
+        },
+        trueValue: {
+            type: null,
+            default: true
+        },
+        falseValue: {
+            type: null,
+            default: false
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        readonly: {
+            type: Boolean,
+            default: false
+        },
+        required: {
+            type: Boolean,
+            default: false
+        },
+        tabindex: {
+            type: Number,
+            default: null
+        },
+        inputId: {
+            type: String,
+            default: null
+        },
+        inputClass: {
+            type: [String, Object],
+            default: null
+        },
+        inputStyle: {
+            type: Object,
+            default: null
+        },
+        inputProps: {
+            type: null,
+            default: null
+        },
+        'aria-labelledby': {
+            type: String,
+            default: null
+        },
+        'aria-label': {
+            type: String,
+            default: null
+        }
+    },
+    css: {
+        classes
+    },
+    watch: {
+        isUnstyled: {
+            immediate: true,
+            handler(newValue) {
+                !newValue && loadStyle();
+            }
+        }
+    }
+};
+</script>
diff --git a/components/lib/checkbox/Checkbox.d.ts b/components/lib/checkbox/Checkbox.d.ts
index 166750db9..e3cfad4f7 100755
--- a/components/lib/checkbox/Checkbox.d.ts
+++ b/components/lib/checkbox/Checkbox.d.ts
@@ -144,6 +144,11 @@ export interface CheckboxProps {
      * @type {CheckboxPassThroughOptions}
      */
     pt?: CheckboxPassThroughOptions;
+    /**
+     * When enabled, it removes component related styles in the core.
+     * @defaultValue false
+     */
+    unstyled?: boolean;
 }
 
 export interface CheckboxSlots {
@@ -156,6 +161,10 @@ export interface CheckboxSlots {
          * State of the checkbox.
          */
         checked: boolean;
+        /**
+         * Style class of the icon.
+         */
+        class: string;
     }): VNode[];
 }
 
diff --git a/components/lib/checkbox/Checkbox.vue b/components/lib/checkbox/Checkbox.vue
index 760c6c05e..ad6a42188 100755
--- a/components/lib/checkbox/Checkbox.vue
+++ b/components/lib/checkbox/Checkbox.vue
@@ -1,6 +1,6 @@
 <template>
-    <div :class="containerClass" @click="onClick($event)" v-bind="ptm('root')">
-        <div class="p-hidden-accessible" v-bind="ptm('hiddenInputWrapper')">
+    <div :class="cx('root')" @click="onClick($event)" v-bind="ptm('root')">
+        <div :class="cx('hiddenInputWrapper')" :style="sx('hiddenAccessible', isUnstyled)" v-bind="ptm('hiddenInputWrapper')" :data-p-hidden-accessible="true">
             <input
                 ref="input"
                 :id="inputId"
@@ -19,80 +19,23 @@
                 v-bind="ptm('hiddenInput')"
             />
         </div>
-        <div ref="box" :class="['p-checkbox-box', inputClass, { 'p-highlight': checked, 'p-disabled': disabled, 'p-focus': focused }]" :style="inputStyle" v-bind="{ ...inputProps, ...ptm('input') }">
-            <slot name="icon" :checked="checked">
-                <component :is="checked ? 'CheckIcon' : null" class="p-checkbox-icon" v-bind="ptm('icon')" />
+        <div ref="box" :class="[cx('input'), inputClass]" :style="inputStyle" v-bind="{ ...inputProps, ...ptm('input') }" :data-p-highlight="checked" :data-p-disabled="disabled" :data-p-focused="focused">
+            <slot name="icon" :checked="checked" :class="cx('icon')">
+                <component :is="checked ? 'CheckIcon' : null" :class="cx('icon')" v-bind="ptm('icon')" />
             </slot>
         </div>
     </div>
 </template>
 
 <script>
-import BaseComponent from 'primevue/basecomponent';
 import CheckIcon from 'primevue/icons/check';
 import { ObjectUtils } from 'primevue/utils';
+import BaseCheckbox from './BaseCheckbox.vue';
 
 export default {
     name: 'Checkbox',
-    extends: BaseComponent,
+    extends: BaseCheckbox,
     emits: ['click', 'update:modelValue', 'change', 'input', 'focus', 'blur'],
-    props: {
-        value: null,
-        modelValue: null,
-        binary: Boolean,
-        name: {
-            type: String,
-            default: null
-        },
-        trueValue: {
-            type: null,
-            default: true
-        },
-        falseValue: {
-            type: null,
-            default: false
-        },
-        disabled: {
-            type: Boolean,
-            default: false
-        },
-        readonly: {
-            type: Boolean,
-            default: false
-        },
-        required: {
-            type: Boolean,
-            default: false
-        },
-        tabindex: {
-            type: Number,
-            default: null
-        },
-        inputId: {
-            type: String,
-            default: null
-        },
-        inputClass: {
-            type: [String, Object],
-            default: null
-        },
-        inputStyle: {
-            type: Object,
-            default: null
-        },
-        inputProps: {
-            type: null,
-            default: null
-        },
-        'aria-labelledby': {
-            type: String,
-            default: null
-        },
-        'aria-label': {
-            type: String,
-            default: null
-        }
-    },
     data() {
         return {
             focused: false
@@ -129,16 +72,6 @@ export default {
     computed: {
         checked() {
             return this.binary ? this.modelValue === this.trueValue : ObjectUtils.contains(this.value, this.modelValue);
-        },
-        containerClass() {
-            return [
-                'p-checkbox p-component',
-                {
-                    'p-checkbox-checked': this.checked,
-                    'p-checkbox-disabled': this.disabled,
-                    'p-checkbox-focused': this.focused
-                }
-            ];
         }
     },
     components: {