From e37d26d0cd52b44725fead5b3fbaeaae286ad6cf Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Thu, 23 Nov 2023 11:20:38 +0000
Subject: [PATCH] fix: Now dbl click and enter on selected rich cell opens the
 modal and click to open is removed, and the cell active border is maintained
 after opening rich modal

---
 packages/nc-gui/components/cell/TextArea.vue         | 9 ++++++++-
 packages/nc-gui/components/smartsheet/grid/Table.vue | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index f6016046bb..3a9cc64705 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -154,6 +154,12 @@ const dragStart = () => {
 
   isDragging.value = true
 }
+
+watch(editEnabled, () => {
+  if (editEnabled.value) {
+    isVisible.value = true
+  }
+})
 </script>
 
 <template>
@@ -179,7 +185,7 @@ const dragStart = () => {
           maxHeight: `${height}px !important`,
           minHeight: `${height}px !important`,
         }"
-        @click="onExpand"
+        @dblclick="onExpand"
       >
         <LazyCellRichText v-model:value="vModel" sync-value-change readonly class="!pointer-events-none" />
       </div>
@@ -227,6 +233,7 @@ const dragStart = () => {
       <span v-else>{{ vModel }}</span>
 
       <NcTooltip
+        v-if="!isVisible"
         placement="bottom"
         class="!absolute right-0 bottom-1 !hidden nc-text-area-expand-btn"
         :class="{ 'right-0 bottom-2': editEnabled }"
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index d62c6307ab..7b9b5cb640 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -761,6 +761,9 @@ onClickOutside(tableBodyEl, (e) => {
 
   if (activeCell.row === null || activeCell.col === null) return
 
+  const isRichModalOpen = isExpandedCellInputExist()
+  if (isRichModalOpen) return
+
   const activeCol = fields.value[activeCell.col]
 
   if (editEnabled.value && (isVirtualCol(activeCol) || activeCol.uidt === UITypes.JSON)) return