From ded004ccd8c2e27cd9060b34f77cf36535c03f43 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 19 May 2021 17:18:43 +0800
Subject: [PATCH] fix: event target

---
 packages/uni-core/src/view/plugin/componentInstance.ts | 7 +++----
 packages/uni-h5/dist/uni-h5.cjs.js                     | 7 +++----
 packages/uni-h5/dist/uni-h5.es.js                      | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/uni-core/src/view/plugin/componentInstance.ts b/packages/uni-core/src/view/plugin/componentInstance.ts
index 370e3faea..40da260f4 100644
--- a/packages/uni-core/src/view/plugin/componentInstance.ts
+++ b/packages/uni-core/src/view/plugin/componentInstance.ts
@@ -34,14 +34,13 @@ export function $nne(this: ComponentPublicInstance, evt: Event) {
 }
 
 export function createNativeEvent(evt: Event | TouchEvent) {
-  const { type, timeStamp, currentTarget } = evt
-  const target = normalizeTarget(currentTarget as HTMLElement)
+  const { type, timeStamp, target, currentTarget } = evt
   const event = {
     type,
     timeStamp,
-    target,
+    target: normalizeTarget(target as HTMLElement),
     detail: {},
-    currentTarget: target,
+    currentTarget: normalizeTarget(currentTarget as HTMLElement),
   }
   if (evt.type.startsWith('touch')) {
     ;(event as any).touches = (evt as TouchEvent).touches
diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index 3c4daba19..e687cdcf3 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -283,14 +283,13 @@ function createCallbacks(namespace) {
   };
 }
 function createNativeEvent(evt) {
-  const {type, timeStamp, currentTarget} = evt;
-  const target = uniShared.normalizeTarget(currentTarget);
+  const {type, timeStamp, target, currentTarget} = evt;
   const event = {
     type,
     timeStamp,
-    target,
+    target: uniShared.normalizeTarget(target),
     detail: {},
-    currentTarget: target
+    currentTarget: uniShared.normalizeTarget(currentTarget)
   };
   if (evt.type.startsWith("touch")) {
     event.touches = evt.touches;
diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
index a179261a4..568d2fdb5 100644
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -839,14 +839,13 @@ function $nne(evt) {
   return res;
 }
 function createNativeEvent(evt) {
-  const {type, timeStamp, currentTarget} = evt;
-  const target = normalizeTarget(currentTarget);
+  const {type, timeStamp, target, currentTarget} = evt;
   const event = {
     type,
     timeStamp,
-    target,
+    target: normalizeTarget(target),
     detail: {},
-    currentTarget: target
+    currentTarget: normalizeTarget(currentTarget)
   };
   if (evt.type.startsWith("touch")) {
     event.touches = evt.touches;
-- 
GitLab