From 6ef17339cf9c0dccf9d551c55206eb75b5f2cb6b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 5 Jan 2023 14:10:21 +0530
Subject: [PATCH 1/4] fix(gui): cell copy-paste if condition correction

re #4758

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/composables/useMultiSelect/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 104b7888b9..7ac874e192 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -267,7 +267,8 @@ export function useMultiSelect(
               // copy - ctrl/cmd +c
               case 67:
                 // set clipboard context only if single cell selected
-                if (selectedRange.isSingleCell() && rowObj.row[columnObj.title!]) {
+                // or if selected range is empty
+                if ((selectedRange.isSingleCell() || selectedRange.isEmpty()) && rowObj.row[columnObj.title!]) {
                   clipboardContext = {
                     value: rowObj.row[columnObj.title!],
                     uidt: columnObj.uidt as UITypes,

From 27d05c65bb2b18f16b9dc255f30be8642471e731 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 5 Jan 2023 15:30:49 +0530
Subject: [PATCH 2/4] fix(gui): assign click event handler to button

re #4760

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/cell/Json.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue
index 8d8d6b9831..2432c7ee7a 100644
--- a/packages/nc-gui/components/cell/Json.vue
+++ b/packages/nc-gui/components/cell/Json.vue
@@ -134,8 +134,8 @@ useSelectedCellKeyupListener(active, (e) => {
         <div v-if="!isForm || isExpanded" class="flex flex-row">
           <a-button type="text" size="small" :onclick="clear"><div class="text-xs">Cancel</div></a-button>
 
-          <a-button type="primary" size="small" :disabled="!!error || localValue === vModel">
-            <div class="text-xs" @click="onSave">Save</div>
+          <a-button type="primary" size="small" :disabled="!!error || localValue === vModel" @click="onSave">
+            <div class="text-xs">Save</div>
           </a-button>
         </div>
       </div>

From 25129c23fbe2a24990fd6925632c25a972841e60 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 5 Jan 2023 17:52:41 +0530
Subject: [PATCH 3/4] fix(gui): stop mouse event propagation from json cell to
 avoid unexpected behaviour

re #4760

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/cell/Json.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue
index 2432c7ee7a..b4176d0d64 100644
--- a/packages/nc-gui/components/cell/Json.vue
+++ b/packages/nc-gui/components/cell/Json.vue
@@ -123,8 +123,8 @@ useSelectedCellKeyupListener(active, (e) => {
 
 <template>
   <component :is="isExpanded ? AModal : 'div'" v-model:visible="isExpanded" :closable="false" centered :footer="null">
-    <div v-if="editEnabled && !readonly" class="flex flex-col w-full">
-      <div class="flex flex-row justify-between pt-1 pb-2">
+    <div v-if="editEnabled && !readonly" class="flex flex-col w-full" @mousedown.stop @mouseup.stop @click.stop>
+      <div class="flex flex-row justify-between pt-1 pb-2" @mousedown.stop>
         <a-button type="text" size="small" @click="isExpanded = !isExpanded">
           <CilFullscreenExit v-if="isExpanded" class="h-2.5" />
 

From c3503bc82b42399cae5a8342515e97754da05304 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 11 Jan 2023 14:54:05 +0530
Subject: [PATCH 4/4] fix(gui): handle empty string in percent and currency
 cell as null

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/cell/Currency.vue        | 13 ++++++++++++-
 packages/nc-gui/components/cell/Percent.vue         | 13 ++++++++++++-
 packages/nc-gui/composables/useMultiSelect/index.ts |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index c65a699d98..2ff0e2560a 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -14,7 +14,18 @@ const column = inject(ColumnInj)!
 
 const editEnabled = inject(EditModeInj)!
 
-const vModel = useVModel(props, 'modelValue', emit)
+const _vModel = useVModel(props, 'modelValue', emit)
+
+const vModel = computed({
+  get: () => _vModel.value,
+  set: (value: unknown) => {
+    if (value === '') {
+      _vModel.value = null
+    } else {
+      _vModel.value = value as number
+    }
+  },
+})
 
 const lastSaved = ref()
 
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index c8907656d2..bea2acd71b 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -12,7 +12,18 @@ const emits = defineEmits(['update:modelValue'])
 
 const editEnabled = inject(EditModeInj)
 
-const vModel = useVModel(props, 'modelValue', emits)
+const _vModel = useVModel(props, 'modelValue', emits)
+
+const vModel = computed({
+  get: () => _vModel.value,
+  set: (value) => {
+    if (value === '') {
+      _vModel.value = null
+    } else {
+      _vModel.value = value
+    }
+  },
+})
 
 const focus: VNodeRef = (el) => {
   ;(el as HTMLInputElement)?.focus()
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 7ac874e192..37a350379c 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -268,7 +268,7 @@ export function useMultiSelect(
               case 67:
                 // set clipboard context only if single cell selected
                 // or if selected range is empty
-                if ((selectedRange.isSingleCell() || selectedRange.isEmpty()) && rowObj.row[columnObj.title!]) {
+                if (selectedRange.isSingleCell() || (selectedRange.isEmpty() && rowObj && columnObj)) {
                   clipboardContext = {
                     value: rowObj.row[columnObj.title!],
                     uidt: columnObj.uidt as UITypes,