From ed0fcf2a893073ec89bf648de0be8632d9d968fb Mon Sep 17 00:00:00 2001
From: KumJungMin <rmawjdals@naver.com>
Date: Wed, 4 Sep 2024 17:32:17 +0900
Subject: [PATCH 1/4] fix: change click event handling by using
 event.currentTarget instead of event.target

---
 packages/primevue/src/datatable/DataTable.vue | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/primevue/src/datatable/DataTable.vue b/packages/primevue/src/datatable/DataTable.vue
index a1241234d..0baa45f5d 100755
--- a/packages/primevue/src/datatable/DataTable.vue
+++ b/packages/primevue/src/datatable/DataTable.vue
@@ -280,29 +280,29 @@
 </template>
 
 <script>
+import {
+addClass,
+addStyle,
+clearSelection,
+exportCSV,
+find,
+findSingle,
+focus,
+getAttribute,
+getHiddenElementOuterHeight,
+getHiddenElementOuterWidth,
+getIndex,
+getOffset,
+getOuterHeight,
+getOuterWidth,
+getWindowScrollTop,
+isClickable,
+removeClass,
+setAttribute
+} from '@primeuix/utils/dom';
+import { equals, findIndexInList, isEmpty, isNotEmpty, localeComparator, reorderArray, resolveFieldData, sort } from '@primeuix/utils/object';
 import { FilterMatchMode, FilterOperator, FilterService } from '@primevue/core/api';
 import { HelperSet, UniqueComponentId, getVNodeProp } from '@primevue/core/utils';
-import {
-    getAttribute,
-    clearSelection,
-    findSingle,
-    isClickable,
-    find,
-    focus,
-    exportCSV,
-    getOffset,
-    addStyle,
-    getIndex,
-    getOuterWidth,
-    getHiddenElementOuterWidth,
-    getHiddenElementOuterHeight,
-    getWindowScrollTop,
-    getOuterHeight,
-    removeClass,
-    addClass,
-    setAttribute
-} from '@primeuix/utils/dom';
-import { resolveFieldData, localeComparator, sort, findIndexInList, equals, reorderArray, isNotEmpty, isEmpty } from '@primeuix/utils/object';
 import ArrowDownIcon from '@primevue/icons/arrowdown';
 import ArrowUpIcon from '@primevue/icons/arrowup';
 import SpinnerIcon from '@primevue/icons/spinner';
@@ -736,7 +736,7 @@ export default {
             const body = this.$refs.bodyRef && this.$refs.bodyRef.$el;
             const focusedItem = findSingle(body, 'tr[data-p-selectable-row="true"][tabindex="0"]');
 
-            if (isClickable(event.target)) {
+            if (isClickable(event.currentTarget)) {
                 return;
             }
 
@@ -813,9 +813,9 @@ export default {
             this.rowTouched = false;
 
             if (focusedItem) {
-                if (event.target?.getAttribute('data-pc-section') === 'rowtoggleicon' || event.target?.parentElement?.getAttribute('data-pc-section') === 'rowtoggleicon') return;
+                if (event.currentTarget?.getAttribute('data-pc-section') === 'rowtoggleicon') return;
 
-                const targetRow = event.target?.closest('tr[data-p-selectable-row="true"]');
+                const targetRow = event.currentTarget?.closest('tr[data-p-selectable-row="true"]');
 
                 focusedItem.tabIndex = '-1';
                 targetRow.tabIndex = '0';

From 4c9dd17f5785a5fc99a0d64d4fc92cf6aee00181 Mon Sep 17 00:00:00 2001
From: KumJungMin <rmawjdals@naver.com>
Date: Wed, 4 Sep 2024 18:02:29 +0900
Subject: [PATCH 2/4] chore: apply format

---
 packages/primevue/src/datatable/DataTable.vue | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/primevue/src/datatable/DataTable.vue b/packages/primevue/src/datatable/DataTable.vue
index 0baa45f5d..1a6b7e7e7 100755
--- a/packages/primevue/src/datatable/DataTable.vue
+++ b/packages/primevue/src/datatable/DataTable.vue
@@ -281,24 +281,24 @@
 
 <script>
 import {
-addClass,
-addStyle,
-clearSelection,
-exportCSV,
-find,
-findSingle,
-focus,
-getAttribute,
-getHiddenElementOuterHeight,
-getHiddenElementOuterWidth,
-getIndex,
-getOffset,
-getOuterHeight,
-getOuterWidth,
-getWindowScrollTop,
-isClickable,
-removeClass,
-setAttribute
+    addClass,
+    addStyle,
+    clearSelection,
+    exportCSV,
+    find,
+    findSingle,
+    focus,
+    getAttribute,
+    getHiddenElementOuterHeight,
+    getHiddenElementOuterWidth,
+    getIndex,
+    getOffset,
+    getOuterHeight,
+    getOuterWidth,
+    getWindowScrollTop,
+    isClickable,
+    removeClass,
+    setAttribute
 } from '@primeuix/utils/dom';
 import { equals, findIndexInList, isEmpty, isNotEmpty, localeComparator, reorderArray, resolveFieldData, sort } from '@primeuix/utils/object';
 import { FilterMatchMode, FilterOperator, FilterService } from '@primevue/core/api';

From 896d4e7d006aded8caba7286b5a76d52a6e80fde Mon Sep 17 00:00:00 2001
From: KumJungMin <rmawjdals@naver.com>
Date: Wed, 4 Sep 2024 18:13:24 +0900
Subject: [PATCH 3/4] test: update test originEvent target

---
 packages/primevue/src/datatable/DataTable.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/primevue/src/datatable/DataTable.spec.js b/packages/primevue/src/datatable/DataTable.spec.js
index a8ffd759c..a326a3c41 100644
--- a/packages/primevue/src/datatable/DataTable.spec.js
+++ b/packages/primevue/src/datatable/DataTable.spec.js
@@ -458,7 +458,7 @@ describe('DataTable.vue', () => {
         await wrapper.setProps({ selection: null, selectionMode: 'single' });
 
         await wrapper.vm.onRowClick({
-            originalEvent: { target: wrapper.findAll('tr.p-datatable-selectable-row')[0].element },
+            originalEvent: { currentTarget: wrapper.findAll('tr.p-datatable-selectable-row')[0].element },
             data: smallData[0],
             index: 0
         });
@@ -492,13 +492,13 @@ describe('DataTable.vue', () => {
         await wrapper.setProps({ selection: null, selectionMode: 'multiple', metaKeySelection: false });
 
         await wrapper.vm.onRowClick({
-            originalEvent: { target: wrapper.findAll('.p-datatable-selectable-row')[0].element },
+            originalEvent: { currentTarget: wrapper.findAll('.p-datatable-selectable-row')[0].element },
             data: smallData[0],
             index: 0
         });
 
         await wrapper.vm.onRowClick({
-            originalEvent: { target: wrapper.findAll('tr.p-datatable-selectable-row')[1].element },
+            originalEvent: { currentTarget: wrapper.findAll('tr.p-datatable-selectable-row')[1].element },
             data: smallData[1],
             index: 1
         });

From a3a45347300fef72101bab9a293e2199f88de86b Mon Sep 17 00:00:00 2001
From: KumJungMin <rmawjdals@naver.com>
Date: Wed, 4 Sep 2024 18:15:37 +0900
Subject: [PATCH 4/4] test: update test target

---
 packages/primevue/src/datatable/DataTable.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/primevue/src/datatable/DataTable.spec.js b/packages/primevue/src/datatable/DataTable.spec.js
index a326a3c41..4e6f15c04 100644
--- a/packages/primevue/src/datatable/DataTable.spec.js
+++ b/packages/primevue/src/datatable/DataTable.spec.js
@@ -472,13 +472,13 @@ describe('DataTable.vue', () => {
         await wrapper.setProps({ selection: null, selectionMode: 'multiple' });
 
         await wrapper.vm.onRowClick({
-            originalEvent: { shiftKey: true, target: wrapper.findAll('tr.p-datatable-selectable-row')[0].element },
+            originalEvent: { shiftKey: true, currentTarget: wrapper.findAll('tr.p-datatable-selectable-row')[0].element },
             data: smallData[0],
             index: 0
         });
 
         await wrapper.vm.onRowClick({
-            originalEvent: { shiftKey: true, target: wrapper.findAll('tr.p-datatable-selectable-row')[1].element },
+            originalEvent: { shiftKey: true, currentTarget: wrapper.findAll('tr.p-datatable-selectable-row')[1].element },
             data: smallData[1],
             index: 1
         });