fix(runtime): 修复阻止跨代组件事件冒泡失败的问题，fix #8757

NervJS · Mar 12, 2021 · b50d9f5 · b50d9f5
1 parent dbb65e0
commit b50d9f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/packages/taro-runtime/src/dom/event.ts b/packages/taro-runtime/src/dom/event.ts
@@ -3,6 +3,7 @@ import { EMPTY_OBJ } from '@tarojs/shared'
 import { document } from '../bom/document'
 import { TaroElement } from './element'
 import { CurrentReconciler } from '../reconciler'
+import { isParentBinded } from '../utils'
 
 interface EventOptions {
   bubbles: boolean;
@@ -107,9 +108,8 @@ export function eventHandler (event: MpEvent) {
     }
     if (typeof CurrentReconciler.batchedEventUpdates === 'function') {
       const type = event.type
-      const isParentBinded = node.parentElement?.__handlers[type]?.length
 
-      if (!isParentBinded || (type === 'touchmove' && !!node.props.catchMove)) {
+      if (!isParentBinded(node, type) || (type === 'touchmove' && !!node.props.catchMove)) {
         // 最上层组件统一 batchUpdate
         CurrentReconciler.batchedEventUpdates(() => {
           if (eventsBatch[type]) {

diff --git a/packages/taro-runtime/src/utils/index.ts b/packages/taro-runtime/src/utils/index.ts
@@ -22,3 +22,20 @@ export function isHasExtractProp (el: TaroElement): boolean {
   })
   return Boolean(res)
 }
+
+/**
+ * 往上寻找组件树直到 root，寻找是否有祖先组件绑定了同类型的事件
+ * @param node 当前组件
+ * @param type 事件类型
+ */
+export function isParentBinded (node: TaroElement | null, type: string): boolean {
+  let res = false
+  while (node?.parentElement && node.parentElement._path !== 'root') {
+    if (node.parentElement.__handlers[type]?.length) {
+      res = true
+      break
+    }
+    node = node.parentElement
+  }
+  return res
+}