@whitesev/domutils 1.9.12 → 2.0.0

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-const version = "1.9.12";
+const version = "2.0.0";
 
 class WindowApi {
     /** 默认的配置 */
@@ -1351,12 +1351,6 @@ const GlobalData = {
     domEventSymbol: Symbol("events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)),
 };
 
-const OriginPrototype = {
-    Object: {
-        defineProperty: Object.defineProperty,
-    },
-};
-
 class ElementEvent extends ElementAnimate {
     windowApi;
     constructor(windowApiOption) {
@@ -1456,6 +1450,9 @@ class ElementEvent extends ElementAnimate {
             listenerOption = getOption(args, 4, listenerOption);
         }
         $elList.forEach(($elItem) => {
+            // window和document共用一个对象
+            // 这样就能处理子元素选择器无法匹配的问题
+            const targetIsWindow = CommonUtils.isWin($elItem);
             // 遍历事件名设置元素事件
             eventTypeList.forEach((eventName) => {
                 /**
@@ -1490,12 +1487,7 @@ class ElementEvent extends ElementAnimate {
                         else {
                             $target = event.target;
                         }
-                        let $parent = $elItem;
-                        if (CommonUtils.isWin($parent)) {
-                            // window和document共用一个对象
-                            // 这样就能处理子元素选择器无法匹配的问题
-                            $parent = that.windowApi.document.documentElement;
-                        }
+                        const $parent = targetIsWindow ? that.windowApi.document.documentElement : $elItem;
                         const findValue = selectorList.find((selectors) => {
                             // 判断目标元素是否匹配选择器
                             if (that.matches($target, selectors)) {
@@ -1512,21 +1504,7 @@ class ElementEvent extends ElementAnimate {
                         });
                         if (findValue) {
                             // 这里尝试使用defineProperty修改event的target值
-                            const originTarget = event.target;
-                            try {
-                                OriginPrototype.Object.defineProperty(event, "target", {
-                                    get() {
-                                        return $target;
-                                    },
-                                });
-                                OriginPrototype.Object.defineProperty(event, "originTarget", {
-                                    get() {
-                                        return originTarget;
-                                    },
-                                });
-                                // oxlint-disable-next-line no-empty
-                            }
-                            catch { }
+                            // 不建议使用覆盖target，因为可能会有兼容性问题
                             execCallback = true;
                             call_this = $target;
                             call_event = event;
@@ -1692,6 +1670,9 @@ class ElementEvent extends ElementAnimate {
                 if (handlers.length === 0) {
                     // 如果没有任意的handler，那么删除该属性
                     CommonUtils.delete(elementEvents, eventType);
+                    if (Object.keys(elementEvents).length === 0) {
+                        CommonUtils.delete($elItem, GlobalData.domEventSymbol);
+                    }
                 }
             });
             Reflect.set($elItem, GlobalData.domEventSymbol, elementEvents);
@@ -1726,11 +1707,11 @@ class ElementEvent extends ElementAnimate {
         }
         $elList.forEach(($elItem) => {
             const symbolList = [...new Set([...Object.getOwnPropertySymbols($elItem), GlobalData.domEventSymbol])];
-            symbolList.forEach((symbolItem) => {
-                if (!symbolItem.toString().startsWith("Symbol(events_")) {
+            symbolList.forEach((__symbol__) => {
+                if (!__symbol__.toString().startsWith("Symbol(events_")) {
                     return;
                 }
-                const elementEvents = Reflect.get($elItem, symbolItem) || {};
+                const elementEvents = Reflect.get($elItem, __symbol__) || {};
                 const iterEventNameList = eventTypeList.length ? eventTypeList : Object.keys(elementEvents);
                 iterEventNameList.forEach((eventName) => {
                     const handlers = elementEvents[eventName];
@@ -1742,8 +1723,11 @@ class ElementEvent extends ElementAnimate {
                             capture: handler.option.capture,
                         });
                     }
-                    const events = Reflect.get($elItem, symbolItem);
+                    const events = Reflect.get($elItem, __symbol__);
                     CommonUtils.delete(events, eventName);
+                    if (Object.keys(events).length === 0) {
+                        CommonUtils.delete($elItem, __symbol__);
+                    }
                 });
             });
         });
@@ -2370,7 +2354,7 @@ class ElementEvent extends ElementAnimate {
             },
         };
     }
-    onDoubleClick(...args) {
+    onOneOrDouble(...args) {
         const $el = args[0];
         let selector = void 0;
         let handler;
@@ -2401,12 +2385,21 @@ class ElementEvent extends ElementAnimate {
         else {
             throw new Error("args length error");
         }
-        let clickMap = new WeakMap();
-        let isDoubleClick = false;
+        let eventNodeMap = new WeakMap();
+        let isDouble = false;
         let timer = void 0;
+        let eventType = "pointerup";
         /** 检测是否是单击的延迟时间 */
-        const checkClickTime = 200;
-        const dblclick_handler = (evt, option, $selector) => {
+        let checkClickTime = 200;
+        if (typeof options === "object" && options != null) {
+            if (typeof options.eventType === "string" || Array.isArray(options.eventType)) {
+                eventType = options.eventType;
+            }
+            if (typeof options.checkClickTime === "number") {
+                checkClickTime = options.checkClickTime;
+            }
+        }
+        const callback = (evt, option, $selector) => {
             if ($selector) {
                 return handler(evt, $selector, option);
             }
@@ -2414,35 +2407,34 @@ class ElementEvent extends ElementAnimate {
                 return handler(evt, option);
             }
         };
-        const pointerUpListener = this.on($el, "pointerup", selector, (evt, $selector) => {
-            // this.preventEvent(evt);
+        const pointerUpListener = this.on($el, eventType, selector, (evt, $selector) => {
             clearTimeout(timer);
             timer = void 0;
-            if (isDoubleClick && clickMap.has($selector)) {
-                isDoubleClick = false;
-                clickMap.delete($selector);
-                /* 判定为双击 */
-                dblclick_handler(evt, {
+            if (isDouble && eventNodeMap.has($selector)) {
+                isDouble = false;
+                eventNodeMap.delete($selector);
+                // 判定为双次
+                callback(evt, {
                     isDoubleClick: true,
                 }, $selector);
             }
             else {
                 timer = setTimeout(() => {
-                    isDoubleClick = false;
-                    // 判断为单击
-                    dblclick_handler(evt, {
+                    isDouble = false;
+                    // 判断为单次
+                    callback(evt, {
                         isDoubleClick: false,
                     }, $selector);
                 }, checkClickTime);
-                isDoubleClick = true;
-                clickMap.set($selector, evt);
+                isDouble = true;
+                eventNodeMap.set($selector, evt);
             }
         }, options);
         return {
             off() {
                 pointerUpListener.off();
                 // @ts-expect-error
-                clickMap = null;
+                eventNodeMap = null;
             },
         };
     }