From 94bde3fb8a2980fc4afbdbe3456783531c52432d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 3 Aug 2022 00:40:29 +0530
Subject: [PATCH] fix(gui-v2): clear cell

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/components/smartsheet/Grid.vue  | 33 ++++++++++---------
 packages/nc-gui-v2/composables/useViewData.ts |  4 +--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index 01c3718c1c..e1197958ab 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { isVirtualCol } from 'nocodb-sdk'
+import { ColumnType, isVirtualCol } from 'nocodb-sdk'
 import {
+  Row,
   inject,
   onKeyStroke,
   onMounted,
@@ -118,6 +119,19 @@ watch(contextMenu, () => {
   }
 })
 
+const clearCell = async (ctx: { row: number; col: number }) => {
+  const rowObj = data.value[ctx.row]
+  const columnObj = fields.value[ctx.col]
+
+  if (isVirtualCol(columnObj)) {
+    return
+  }
+
+  rowObj.row[columnObj.title] = null
+  // update/save cell value
+  await updateOrSaveRow(rowObj, columnObj.title)
+}
+
 /** handle keypress events */
 onKeyStroke(['Tab', 'Shift', 'Enter', 'Delete', 'ArrowDown', 'ArrowUp', 'ArrowLeft', 'ArrowRight'], async (e: KeyboardEvent) => {
   if (selected.row !== null && selected.col !== null) {
@@ -148,19 +162,8 @@ onKeyStroke(['Tab', 'Shift', 'Enter', 'Delete', 'ArrowDown', 'ArrowUp', 'ArrowLe
         break
       /** on delete key press clear cell */
       case 'Delete':
-        {
-          e.preventDefault()
-          const rowObj = data.value[selected.row]
-          const columnObj = fields.value[selected.col]
-
-          if (isVirtualCol(columnObj)) {
-            return
-          }
-
-          rowObj.row[columnObj.title] = null
-          // update/save cell value
-          await updateOrSaveRow(rowObj, columnObj.title)
-        }
+        e.preventDefault()
+        await clearCell(selected as { row: number; col: number })
         break
       /** on arrow key press navigate through cells */
       case 'ArrowRight':
@@ -294,7 +297,7 @@ onKeyStroke(['Tab', 'Shift', 'Enter', 'Delete', 'ArrowDown', 'ArrowUp', 'ArrowLe
         <div class="bg-white shadow" @click="contextMenu = false">
           <div v-if="contextMenuTarget" class="nc-menu-item" @click="deleteRow(contextMenuTarget.row)">Delete row</div>
           <div class="nc-menu-item" @click="deleteSelectedRows">Delete all selected rows</div>
-          <div v-if="contextMenuTarget" class="nc-menu-item" >Clear cell</div>
+          <div v-if="contextMenuTarget" class="nc-menu-item" @click="clearCell(contextMenuTarget)">Clear cell</div>
           <div v-if="contextMenuTarget" class="nc-menu-item" @click="addEmptyRow(contextMenuTarget.row + 1)">Insert new row</div>
         </div>
       </template>
diff --git a/packages/nc-gui-v2/composables/useViewData.ts b/packages/nc-gui-v2/composables/useViewData.ts
index 2e43575200..9ee4a5b735 100644
--- a/packages/nc-gui-v2/composables/useViewData.ts
+++ b/packages/nc-gui-v2/composables/useViewData.ts
@@ -13,7 +13,7 @@ const formatData = (list: Record<string, any>[]) =>
     rowMeta: {},
   }))
 
-interface Row {
+export interface Row {
   row: Record<string, any>
   oldRow: Record<string, any>
   rowMeta?: any
@@ -136,7 +136,7 @@ export function useViewData(
   }
 
   const addEmptyRow = (addAfter = formattedData.value.length) => {
-    formattedData.value.splice(addAfter,0,  {
+    formattedData.value.splice(addAfter, 0, {
       row: {},
       oldRow: {},
       rowMeta: { new: true },