fix(react): 修复 react 不能取消事件监听的问题

NervJS · Jan 14, 2021 · fb057d3 · fb057d3
1 parent f9b034a
commit fb057d3
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/packages/taro-react/src/props.ts b/packages/taro-react/src/props.ts
@@ -1,6 +1,5 @@
-import { TaroElement, Style, document, FormElement } from '@tarojs/runtime'
+import { TaroElement, Style, FormElement } from '@tarojs/runtime'
 import { isFunction, isString, isObject, isNumber, internalComponents, capitalize, toCamelCase } from '@tarojs/shared'
-import { CommonEvent } from '@tarojs/components'
 
 export type Props = Record<string, unknown>
 
@@ -26,11 +25,11 @@ export function updateProps (dom: TaroElement, oldProps: Props, newProps: Props)
   }
 }
 
-function eventProxy (e: CommonEvent) {
-  const el = document.getElementById(e.currentTarget.id)
-  const handlers = el!.__handlers[e.type]
-  handlers[0](e)
-}
+// function eventProxy (e: CommonEvent) {
+//   const el = document.getElementById(e.currentTarget.id)
+//   const handlers = el!.__handlers[e.type]
+//   handlers[0](e)
+// }
 
 function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: unknown) {
   const isCapture = name.endsWith('Capture')
@@ -47,7 +46,7 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
 
   if (isFunction(value)) {
     if (!oldValue) {
-      dom.addEventListener(eventName, eventProxy, isCapture)
+      dom.addEventListener(eventName, value, isCapture)
     }
     if (eventName === 'regionchange') {
       dom.__handlers.begin[0] = value
@@ -56,7 +55,7 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
       dom.__handlers[eventName][0] = value
     }
   } else {
-    dom.removeEventListener(eventName, eventProxy)
+    dom.removeEventListener(eventName, oldValue as any)
   }
 }