From 266de121ee860f5d043650a7278a4c865c35f8d8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 25 Aug 2022 15:34:29 +0530
Subject: [PATCH] refactor(gui-v2): pressing delete should only delete selected
 cell content if not in editable mode

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/components/smartsheet/Grid.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index a5db17b0b0..1f0be84c9f 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -219,7 +219,7 @@ const onKeyDown = async (e: KeyboardEvent) => {
     /** on delete key press clear cell */
     case 'Delete':
       e.preventDefault()
-      await clearCell(selected as { row: number; col: number })
+      if (!editEnabled) await clearCell(selected as { row: number; col: number })
       break
     /** on arrow key press navigate through cells */
     case 'ArrowRight':
@@ -467,9 +467,9 @@ const onNavigate = (dir: NavigateDir) => {
             </SmartsheetRow>
 
             <!--
-              TODO: add relationType !== 'bt' ?
-              v1: <tr v-if="!isView && !isLocked && !isPublicView && isEditable && relationType !== 'bt'">
-            -->
+            TODO: add relationType !== 'bt' ?
+            v1: <tr v-if="!isView && !isLocked && !isPublicView && isEditable && relationType !== 'bt'">
+          -->
             <tr v-if="!isView && !isLocked && !isPublicView && isUIAllowed('xcDatatableEditable')">
               <td
                 v-t="['c:row:add:grid-bottom']"
@@ -596,10 +596,12 @@ const onNavigate = (dir: NavigateDir) => {
   .nc-row-expand-and-checkbox {
     @apply w-full items-center justify-between;
   }
+
   .nc-expand {
     &:not(.nc-comment) {
       @apply hidden;
     }
+
     &.nc-comment {
       display: flex;
     }