@whitesev/domutils 1.6.7 → 1.6.8

package/src/DOMUtilsEvent.ts

@@ -440,7 +440,7 @@ export class DOMUtilsEvent {
       const currentParam: EventListenerOptions | boolean = args1[startIndex];
       if (typeof currentParam === "boolean") {
         option.capture = currentParam;
-      } else if (typeof currentParam === "object" && "capture" in currentParam) {
+      } else if (typeof currentParam === "object" && currentParam != null && "capture" in currentParam) {
         option.capture = currentParam.capture;
       }
       return option;
@@ -507,18 +507,24 @@ export class DOMUtilsEvent {
       // 目标函数、事件名、子元素选择器
       isRemoveAll = true;
     }
+    if (args.length === 5 && typeof args[4] === "function" && typeof filter !== "function") {
+      // 目标函数、事件名、回调函数、事件配置、过滤函数
+      filter = option as (
+        value: DOMUtilsEventListenerOptionsAttribute,
+        index: number,
+        array: DOMUtilsEventListenerOptionsAttribute[]
+      ) => boolean;
+    }
     elementList.forEach((elementItem) => {
       /* 获取对象上的事件 */
       const elementEvents: {
         [key: string]: DOMUtilsEventListenerOptionsAttribute[];
       } = Reflect.get(elementItem, DOMUtilsData.SymbolEvents) || {};
       eventTypeList.forEach((eventName) => {
-        let handlers = elementEvents[eventName] || [];
-        if (typeof filter === "function") {
-          handlers = handlers.filter(filter);
-        }
-        for (let index = 0; index < handlers.length; index++) {
-          const handler = handlers[index];
+        const handlers = elementEvents[eventName] || [];
+        const filterHandler = typeof filter === "function" ? handlers.filter(filter) : handlers;
+        for (let index = 0; index < filterHandler.length; index++) {
+          const handler = filterHandler[index];
           let flag = true;
           if (flag && listenerCallBack && handler.originCallBack !== listenerCallBack) {
             // callback不同
@@ -530,13 +536,20 @@ export class DOMUtilsEvent {
               flag = false;
             }
           }
-          if (flag && listenerOption.capture !== handler.option.capture) {
+          if (
+            flag &&
+            typeof handler.option.capture === "boolean" &&
+            listenerOption.capture !== handler.option.capture
+          ) {
             // 事件的配置项不同
             flag = false;
           }
           if (flag || isRemoveAll) {
             elementItem.removeEventListener(eventName, handler.callback, handler.option);
-            handlers.splice(index--, 1);
+            const findIndex = handlers.findIndex((item) => item === handler);
+            if (findIndex !== -1) {
+              handlers.splice(findIndex, 1);
+            }
           }
         }
         if (handlers.length === 0) {