@tarojs/runtime 3.4.0-beta.3 → 3.5.0-canary.1

package/dist/runtime.esm.js

@@ -70,10 +70,9 @@ if (process.env.TARO_ENV === 'h5') {
           };
           // Load global or shim versions of Map, Set, and WeakMap
           var functionPrototype = Object.getPrototypeOf(Function);
-          var usePolyfill = isObject(process) && process.env && process.env["REFLECT_METADATA_USE_MAP_POLYFILL"] === "true";
           var _Map = Map;
           var _Set = Set;
-          var _WeakMap = !usePolyfill && isFunction(WeakMap) ? WeakMap : CreateWeakMapPolyfill();
+          var _WeakMap = isFunction(WeakMap) ? WeakMap : CreateWeakMapPolyfill();
           // [[Metadata]] internal slot
           // https://rbuckton.github.io/reflect-metadata/#ordinary-object-internal-methods-and-internal-slots
           var Metadata = new _WeakMap();
@@ -1359,14 +1358,7 @@ let TaroEventTarget = class TaroEventTarget {
     }
     addEventListener(type, handler, options) {
         var _a, _b;
-        // 某些框架，如 PReact 有委托的机制，handler 始终是同一个函数
-        // 这会导致多层停止冒泡失败：view -> view(handler.stop = false) -> view(handler.stop = true)
-        // 这样解决：view -> view(handlerA.stop = false) -> view(handlerB.stop = false)
-        // 因此每次绑定事件都新建一个函数，如果带来了性能问题，可以把这段逻辑抽取到 PReact 插件中。
-        const oldHandler = handler;
-        handler = function () {
-            oldHandler.apply(this, arguments); // this 指向 Element
-        };
+        type = type.toLowerCase();
         (_b = (_a = this.hooks).onAddEvent) === null || _b === void 0 ? void 0 : _b.call(_a, type, handler, options, this);
         if (type === 'regionchange') {
             // map 组件的 regionchange 事件非常特殊，详情：https://github.com/NervJS/taro/issues/5766
@@ -1374,8 +1366,6 @@ let TaroEventTarget = class TaroEventTarget {
             this.addEventListener('end', handler, options);
             return;
         }
-        type = type.toLowerCase();
-        const handlers = this.__handlers[type];
         let isCapture = Boolean(options);
         let isOnce = false;
         if (isObject(options)) {
@@ -1391,6 +1381,16 @@ let TaroEventTarget = class TaroEventTarget {
             return;
         }
         process.env.NODE_ENV !== 'production' && warn(isCapture, 'Taro 暂未实现 event 的 capture 特性。');
+        // 某些框架，如 PReact 有委托的机制，handler 始终是同一个函数
+        // 这会导致多层停止冒泡失败：view -> view(handler.stop = false) -> view(handler.stop = true)
+        // 这样解决：view -> view(handlerA.stop = false) -> view(handlerB.stop = false)
+        // 因此每次绑定事件都新建一个函数，如果带来了性能问题，可以把这段逻辑抽取到 PReact 插件中。
+        const oldHandler = handler;
+        handler = function () {
+            oldHandler.apply(this, arguments); // this 指向 Element
+        };
+        handler.oldHandler = oldHandler;
+        const handlers = this.__handlers[type];
         if (isArray(handlers)) {
             handlers.push(handler);
         }
@@ -1407,7 +1407,10 @@ let TaroEventTarget = class TaroEventTarget {
         if (!isArray(handlers)) {
             return;
         }
-        const index = handlers.indexOf(handler);
+        const index = handlers.findIndex(item => {
+            if (item === handler || item.oldHandler === handler)
+                return true;
+        });
         process.env.NODE_ENV !== 'production' && warn(index === -1, `事件: '${type}' 没有注册在 DOM 中，因此不会被移除。`);
         handlers.splice(index, 1);
     }
@@ -2863,12 +2866,12 @@ function createEvent(event, node) {
 const eventsBatch = {};
 // 小程序的事件代理回调函数
 function eventHandler(event) {
-    var _a, _b;
+    var _a, _b, _c;
     const hooks = getHooks();
     (_a = hooks.modifyMpEvent) === null || _a === void 0 ? void 0 : _a.call(hooks, event);
     event.currentTarget || (event.currentTarget = event.target);
     const currentTarget = event.currentTarget;
-    const id = ((_b = currentTarget.dataset) === null || _b === void 0 ? void 0 : _b.sid /** sid */) || currentTarget.id /** uid */ || '';
+    const id = ((_b = currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.dataset) === null || _b === void 0 ? void 0 : _b.sid /** sid */) || (currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.id) /** uid */ || ((_c = event.detail) === null || _c === void 0 ? void 0 : _c.id) || '';
     const node = getDocument().getElementById(id);
     if (node) {
         const dispatch = () => {