From da96cba95af4deb1f9a8eba4b24d0c07e27f6f84 Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Tue, 2 Mar 2021 13:17:11 +0300
Subject: [PATCH] #1041 for table cell edit

---
 src/components/datatable/BodyCell.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/datatable/BodyCell.vue b/src/components/datatable/BodyCell.vue
index fb5fbc91f..baf5ee675 100755
--- a/src/components/datatable/BodyCell.vue
+++ b/src/components/datatable/BodyCell.vue
@@ -31,8 +31,7 @@
 </template>
 
 <script>
-import {DomHandler} from 'primevue/utils';
-import {ObjectUtils} from 'primevue/utils';
+import {DomHandler,ObjectUtils,OverlayEventBus} from 'primevue/utils';
 import RowRadioButton from './RowRadioButton.vue';
 import RowCheckbox from './RowCheckbox.vue';
 import Ripple from 'primevue/ripple';
@@ -126,7 +125,7 @@ export default {
         bindDocumentEditListener() {
             if (!this.documentEditListener) {
                 this.documentEditListener = (event) => {
-                    if (this.isOutsideClicked()) {
+                    if (!this.selfClick) {
                         this.completeEdit(event, 'outside');
                     }
                     this.selfClick = false;
@@ -145,9 +144,7 @@ export default {
         switchCellToViewMode() {
             this.d_editing = false;
             this.unbindDocumentEditListener();
-        },
-        isOutsideClicked() {
-            return !this.selfClick;
+            OverlayEventBus.off('overlay-click', this.eventBusKey);
         },
         onClick(event) {
             if (this.editMode === 'cell' && this.isEditable()) {
@@ -157,6 +154,12 @@ export default {
                     this.d_editing = true;
                     this.bindDocumentEditListener();
                     this.$emit('cell-edit-init', {originalEvent: event, data: this.rowData, field: this.columnProp('field'), index: this.index});
+
+                    OverlayEventBus.on('overlay-click', e => {
+                        if (this.$el && this.$el.contains(e.target)) {
+                            this.selfClick = true;
+                        }
+                    }, this.eventBusKey);
                 }
             }
         },
@@ -321,6 +324,9 @@ export default {
             let columnStyle = this.columnProp('style');
 
             return this.columnProp('frozen') ? [columnStyle, bodyStyle, this.styleObject]: [columnStyle, bodyStyle];
+        },
+        eventBusKey() {
+            return this.columnProp('field') + '_' + this.index;
         }
     },
     components: {