From 4a163772fb3d122cbe2e66ee34f2bea12fb4f697 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 10 Aug 2022 10:05:17 +0300
Subject: [PATCH] feat(gui-v2): ColorPicker improved

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../components/general/ColorPicker.vue        | 32 ++++++++++++++-----
 .../smartsheet-column/CheckboxOptions.vue     |  2 +-
 .../smartsheet-column/RatingOptions.vue       |  2 +-
 .../smartsheet-column/SelectOptions.vue       |  2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui-v2/components/general/ColorPicker.vue b/packages/nc-gui-v2/components/general/ColorPicker.vue
index 44300663d8..c319f83299 100644
--- a/packages/nc-gui-v2/components/general/ColorPicker.vue
+++ b/packages/nc-gui-v2/components/general/ColorPicker.vue
@@ -3,10 +3,11 @@ import { Chrome } from '@ckpack/vue-color'
 import { enumColor } from '@/utils'
 
 interface Props {
-  modelValue: String
-  colors?: String[]
+  modelValue: string | any
+  colors?: string[]
   rowSize?: number
   advanced?: Boolean
+  pickButton?: Boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -14,14 +15,21 @@ const props = withDefaults(defineProps<Props>(), {
   colors: () => enumColor.light.concat(enumColor.dark),
   rowSize: () => 10,
   advanced: () => true,
+  pickButton: () => false,
 })
 
 const emit = defineEmits(['update:modelValue'])
-const vModel = useVModel(props, 'modelValue', emit)
+
+const vModel = computed({
+  get: () => props.modelValue,
+  set: (val) => {
+    emit('update:modelValue', val.hex ? val.hex : val || null)
+  },
+})
 
 const picked = ref(props.modelValue || enumColor.light[0])
 
-const select = (color: any) => {
+const selectColor = (color: any) => {
   picked.value = color.hex ? color.hex : color
   vModel.value = color.hex ? color.hex : color
 }
@@ -32,6 +40,12 @@ const compare = (colorA: String, colorB: String) => {
   }
   return false
 }
+
+watch(picked, (n, _o) => {
+  if (!props.pickButton) {
+    vModel.value = n.hex ? n.hex : n
+  }
+})
 </script>
 
 <template>
@@ -43,17 +57,19 @@ const compare = (colorA: String, colorB: String) => {
         class="color-selector"
         :class="compare(picked, color) ? 'selected' : ''"
         :style="{ 'background-color': `${color}` }"
-        @click="select(color)"
+        @click="selectColor(color)"
       >
         {{ compare(picked, color) ? '&#10003;' : '' }}
       </button>
     </div>
-    <a-card v-if="props.advanced" class="w-full shadow-lg mt-2" :body-style="{ padding: '0px' }">
+    <a-card v-if="props.advanced" class="w-full mt-2" :body-style="{ padding: '0px' }" :bordered="false">
       <a-collapse accordion ghost expand-icon-position="right">
         <a-collapse-panel key="1" header="Advanced" class="">
-          <a-button class="!bg-primary text-white w-full" @click="select(picked)"> Pick Color </a-button>
+          <a-button v-if="props.pickButton" class="!bg-primary text-white w-full" @click="selectColor(picked)">
+            Pick Color
+          </a-button>
           <div class="flex justify-center py-4">
-            <Chrome v-model="picked" />
+            <Chrome v-model="picked" class="!w-full !shadow-none" />
           </div>
         </a-collapse-panel>
       </a-collapse>
diff --git a/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
index 2c73e40594..3a14c76172 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CheckboxOptions.vue
@@ -93,7 +93,7 @@ watch(
       </a-form-item>
     </a-col>
   </a-row>
-  <a-row>
+  <a-row class="w-full justify-center">
     <GeneralColorPicker
       v-model="picked"
       :row-size="8"
diff --git a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
index c9aebc4042..95d3c22668 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
@@ -96,7 +96,7 @@ watch(
       </a-form-item>
     </a-col>
   </a-row>
-  <a-row>
+  <a-row class="w-full justify-center">
     <GeneralColorPicker
       v-model="picked"
       :row-size="8"
diff --git a/packages/nc-gui-v2/components/smartsheet-column/SelectOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/SelectOptions.vue
index a81984c94b..2b7d9db678 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/SelectOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/SelectOptions.vue
@@ -84,7 +84,7 @@ onMounted(() => {
           <MdiDragIcon small class="nc-child-draggable-icon handle" />
           <a-dropdown v-model:visible="colorMenus[index]" :trigger="['click']">
             <template #overlay>
-              <GeneralColorPicker v-model="element.color" @update:model-value="colorMenus[index] = false" />
+              <GeneralColorPicker v-model="element.color" :pick-button="true" @update:model-value="colorMenus[index] = false" />
             </template>
             <MdiArrowDownDropCircle :style="{ 'font-size': '1.5em', 'color': element.color }" class="mr-2" />
           </a-dropdown>