fixes

code4romania · Sep 27, 2024 · c82de4a · c82de4a
1 parent 74a0ff4
commit c82de4a
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 98 deletions.
diff --git a/resources/js/Components/Form/AddressLookup.vue b/resources/js/Components/Form/AddressLookup.vue
@@ -54,18 +54,6 @@
             type: String,
             default: null,
         },
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        optionValueKey: {
-            type: String,
-            default: 'value',
-        },
-        optionLabelKey: {
-            type: String,
-            default: 'label',
-        },
         modelValue: {
             type: String,
             default: null,

diff --git a/resources/js/Components/Form/AutoComplete.vue b/resources/js/Components/Form/AutoComplete.vue
@@ -6,7 +6,6 @@
 
 <script setup>
     import { computed, ref } from 'vue';
-    import { CheckIcon } from '@heroicons/vue/16/solid';
     import AutoComplete from 'primevue/autocomplete';
     import FormField from '@/Components/Form/Field.vue';
 
@@ -31,18 +30,6 @@
             type: String,
             default: null,
         },
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        optionValueKey: {
-            type: String,
-            default: 'value',
-        },
-        optionLabelKey: {
-            type: String,
-            default: 'label',
-        },
         modelValue: {
             type: String,
             default: null,
@@ -55,15 +42,6 @@
 
     const emit = defineEmits(['update:modelValue']);
 
-    const getOption = (option, key) => (option.hasOwnProperty(key) ? option[key] : option);
-
-    const options = computed(() =>
-        props.options.map((option) => ({
-            value: getOption(option, props.optionValueKey),
-            label: getOption(option, props.optionLabelKey),
-        }))
-    );
-
     const modelValue = computed({
         get: () => props.modelValue,
         set: (value) => emit('update:modelValue', value),

diff --git a/resources/js/Components/Form/Checkbox.vue b/resources/js/Components/Form/Checkbox.vue
@@ -18,7 +18,7 @@
         <div
             class="flex items-center justify-center w-4 h-4 my-0.5 border border-gray-300 bg-white text-white rounded peer-checked:border-transparent peer-disabled:bg-gray-400 peer-disabled:select-none peer-disabled:pointer-events-none peer-disabled:cursor-default peer-focus-visible:z-10 peer-focus-visible:outline-none peer-focus-visible:outline-offset-0 peer-focus-visible:ring-1 peer-focus-visible:ring-offset-2 peer-focus-visible:ring-primary-500 peer-checked:ring-primary-700 peer-checked:bg-primary-700"
         >
-            <CheckIcon />
+            <CheckIcon class="w-full h-full" />
         </div>
 
         <span v-if="label" class="text-sm font-medium text-gray-700" v-text="label" />

diff --git a/resources/js/Components/Form/FileUpload.vue b/resources/js/Components/Form/FileUpload.vue
@@ -87,18 +87,6 @@
             type: String,
             default: null,
         },
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        optionValueKey: {
-            type: String,
-            default: 'value',
-        },
-        optionLabelKey: {
-            type: String,
-            default: 'label',
-        },
         modelValue: {
             type: [Array],
             default: () => [],

diff --git a/resources/js/Components/Form/Input.vue b/resources/js/Components/Form/Input.vue
@@ -4,9 +4,6 @@
             <InputText
                 :type="type"
                 v-model="modelValue"
-                :options="options"
-                optionValue="value"
-                optionLabel="label"
                 class="w-full"
                 :invalid="invalid"
                 :placeholder="placeholder"
@@ -20,7 +17,6 @@
 
 <script setup>
     import { computed } from 'vue';
-    import { CheckIcon } from '@heroicons/vue/16/solid';
     import InputText from 'primevue/inputtext';
     import FormField from '@/Components/Form/Field.vue';
 
@@ -57,18 +53,6 @@
             type: String,
             default: null,
         },
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        optionValueKey: {
-            type: String,
-            default: 'value',
-        },
-        optionLabelKey: {
-            type: String,
-            default: 'label',
-        },
         modelValue: {
             type: [Array, String, Number],
             default: null,
@@ -81,15 +65,6 @@
 
     const emit = defineEmits(['update:modelValue']);
 
-    const getOption = (option, key) => (option.hasOwnProperty(key) ? option[key] : option);
-
-    const options = computed(() =>
-        props.options.map((option) => ({
-            value: getOption(option, props.optionValueKey),
-            label: getOption(option, props.optionLabelKey),
-        }))
-    );
-
     const modelValue = computed({
         get: () => props.modelValue,
         set: (value) => emit('update:modelValue', value),

diff --git a/resources/js/Components/Form/MaterialsChecklist.vue b/resources/js/Components/Form/MaterialsChecklist.vue
@@ -63,7 +63,7 @@
                                         'border-red-500': invalid,
                                     }"
                                 >
-                                    <component :is="!remove ? CheckIcon : XMarkIcon" />
+                                    <component :is="!remove ? CheckIcon : XMarkIcon" class="w-full h-full" />
                                 </div>
 
                                 <span

diff --git a/resources/js/Components/Form/Select.vue b/resources/js/Components/Form/Select.vue
@@ -19,7 +19,6 @@
 
 <script setup>
     import { computed, ref } from 'vue';
-    import { CheckIcon } from '@heroicons/vue/16/solid';
     import Select from 'primevue/select';
     import FormField from '@/Components/Form/Field.vue';
 

diff --git a/resources/js/Components/Form/Textarea.vue b/resources/js/Components/Form/Textarea.vue
@@ -12,9 +12,6 @@
             <Textarea
                 :rows="rows"
                 v-model="modelValue"
-                :options="options"
-                optionValue="value"
-                optionLabel="label"
                 class="w-full"
                 :invalid="invalid"
                 :placeholder="placeholder"
@@ -63,18 +60,6 @@
             type: String,
             default: 'bottom',
         },
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        optionValueKey: {
-            type: String,
-            default: 'value',
-        },
-        optionLabelKey: {
-            type: String,
-            default: 'label',
-        },
         modelValue: {
             type: [Array, String, Number],
             default: null,
@@ -87,15 +72,6 @@
 
     const emit = defineEmits(['update:modelValue']);
 
-    const getOption = (option, key) => (option.hasOwnProperty(key) ? option[key] : option);
-
-    const options = computed(() =>
-        props.options.map((option) => ({
-            value: getOption(option, props.optionValueKey),
-            label: getOption(option, props.optionLabelKey),
-        }))
-    );
-
     const modelValue = computed({
         get: () => props.modelValue,
         set: (value) => emit('update:modelValue', value),
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ @@
                                             'border-red-500': invalid,
                                         }"
                                     >
-                                        <component :is="!remove ? CheckIcon : XMarkIcon" />
+                                        <component :is="!remove ? CheckIcon : XMarkIcon" class="w-full h-full" />
                                     </div>
                                     <span
@@ Expand Down @@