From cf031ab12ba5171eada60581eb00f70435cf810f Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Mon, 5 Sep 2022 14:36:08 +0530
Subject: [PATCH 1/2] fix/Fixed scroll issue with EditOrAdd component

---
 .../smartsheet-column/EditOrAdd.vue           | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 77df6bac23..8548d6136c 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -20,8 +20,6 @@ const advancedOptions = ref(false)
 
 const { getMeta } = useMetas()
 
-const editOrAddRef = ref<HTMLElement>()
-
 const columnToValidate = [UITypes.Email, UITypes.URL, UITypes.PhoneNumber]
 
 const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup]
@@ -79,28 +77,10 @@ onMounted(() => {
     formState.value.column_name = formState.value?.title
   }
 })
-
-const handleClose = (e: MouseEvent) => {
-  const target = e.target as HTMLElement
-
-  if (
-    target &&
-    editOrAddRef?.value &&
-    !editOrAddRef.value.contains(target) &&
-    !target.closest('.ant-dropdown') &&
-    !target.closest('.ant-select') &&
-    !target.closest('.ant-select-item')
-  ) {
-    emit('cancel')
-  }
-}
-
-useEventListener(document, 'click', handleClose)
 </script>
 
 <template>
   <div
-    ref="editOrAddRef"
     class="w-[400px] max-h-[95vh] bg-gray-50 shadow-lg p-6 overflow-auto !border"
     :class="{ '!w-[600px]': formState.uidt === UITypes.Formula }"
     @click.stop

From 2e8de5c384cb0142c958bc142baeef75eefa37e7 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Mon, 5 Sep 2022 15:29:46 +0530
Subject: [PATCH 2/2] fix/Fixed scroll issue with EditOrAdd component fixed for
 edit

---
 .../components/smartsheet-header/Cell.vue          | 14 +-------------
 .../components/smartsheet-header/VirtualCell.vue   | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
index 7f4c8d46b9..33050a4429 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
@@ -15,12 +15,6 @@ const { isUIAllowed } = useUIPermission()
 provide(ColumnInj, column)
 
 const editColumnDropdown = ref(false)
-
-function onVisibleChange() {
-  // only allow to close the EditOrAdd component
-  // by clicking cancel button
-  editColumnDropdown.value = true
-}
 </script>
 
 <template>
@@ -34,13 +28,7 @@ function onVisibleChange() {
       <SmartsheetHeaderMenu v-if="!isForm && isUIAllowed('edit-column')" @edit="editColumnDropdown = true" />
     </template>
 
-    <a-dropdown
-      v-model:visible="editColumnDropdown"
-      class="h-full"
-      :trigger="['click']"
-      placement="bottomRight"
-      @visible-change="onVisibleChange"
-    >
+    <a-dropdown v-model:visible="editColumnDropdown" class="h-full" :trigger="['click']" placement="bottomRight">
       <div />
       <template #overlay>
         <SmartsheetColumnEditOrAddProvider
diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
index ceb2f4b034..8a99ae3861 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
@@ -95,12 +95,6 @@ const tooltipMsg = computed(() => {
   }
   return ''
 })
-
-function onVisibleChange() {
-  // only allow to close the EditOrAdd component
-  // by clicking cancel button
-  editColumnDropdown.value = true
-}
 </script>
 
 <template>
@@ -121,13 +115,7 @@ function onVisibleChange() {
       <SmartsheetHeaderMenu v-if="!isForm && isUIAllowed('edit-column')" :virtual="true" @edit="editColumnDropdown = true" />
     </template>
 
-    <a-dropdown
-      v-model:visible="editColumnDropdown"
-      class="h-full"
-      :trigger="['click']"
-      placement="bottomRight"
-      @visible-change="onVisibleChange"
-    >
+    <a-dropdown v-model:visible="editColumnDropdown" class="h-full" :trigger="['click']" placement="bottomRight">
       <div />
       <template #overlay>
         <SmartsheetColumnEditOrAddProvider