@whitesev/domutils 2.0.2 → 2.0.4

package/src/ElementEvent.ts

@@ -1,6 +1,7 @@
 import { CommonUtils } from "./CommonUtils";
 import { ElementAnimate } from "./ElementAnimate";
 import { GlobalData } from "./GlobalData";
+import { OriginPrototype } from "./OriginPrototype";
 import type {
   DOMUtils_Event,
   DOMUtils_EventType,
@@ -163,7 +164,7 @@ class ElementEvent extends ElementAnimate {
      * @param option
      */
     const getOption = function (args: IArguments, startIndex: number, option: DOMUtilsEventListenerOption) {
-      const currentParam = args[startIndex];
+      const currentParam: boolean | DOMUtilsEventListenerOption = args[startIndex];
       if (typeof currentParam === "boolean") {
         option.capture = currentParam;
         if (typeof args[startIndex + 1] === "boolean") {
@@ -173,16 +174,21 @@ class ElementEvent extends ElementAnimate {
           option.passive = args[startIndex + 2];
         }
       } else if (
+        currentParam &&
         typeof currentParam === "object" &&
         ("capture" in currentParam ||
           "once" in currentParam ||
           "passive" in currentParam ||
-          "isComposedPath" in currentParam)
+          "isComposedPath" in currentParam ||
+          "overrideTarget" in currentParam ||
+          "isPreventEvent" in currentParam)
       ) {
         option.capture = currentParam.capture;
         option.once = currentParam.once;
         option.passive = currentParam.passive;
         option.isComposedPath = currentParam.isComposedPath;
+        option.overrideTarget = currentParam.overrideTarget;
+        option.isPreventEvent = currentParam.isPreventEvent;
       }
       return option;
     };
@@ -231,6 +237,7 @@ class ElementEvent extends ElementAnimate {
       once: false,
       passive: false,
       isComposedPath: false,
+      overrideTarget: true,
     };
     if (typeof selector === "function") {
       // 这是为没有selector的情况
@@ -260,6 +267,9 @@ class ElementEvent extends ElementAnimate {
          * @param event
          */
         const handlerCallBack = function (event: Event) {
+          if (listenerOption.isPreventEvent) {
+            that.preventEvent(event);
+          }
           let call_this: Element | undefined = void 0;
           let call_event: Event | undefined = void 0;
           let call_$selector: HTMLElement | undefined = void 0;
@@ -294,8 +304,25 @@ class ElementEvent extends ElementAnimate {
               return false;
             });
             if (findValue) {
-              // 这里尝试使用defineProperty修改event的target值
-              // 不建议使用覆盖target，因为可能会有兼容性问题
+              if (listenerOption.overrideTarget) {
+                // 这里尝试使用defineProperty修改event的target值
+                try {
+                  const originTarget = event.target;
+                  OriginPrototype.Object.defineProperty(event, "target", {
+                    value: $target,
+                    get() {
+                      return $target;
+                    },
+                  });
+                  OriginPrototype.Object.defineProperty(event, "originTarget", {
+                    value: $target,
+                    get() {
+                      return originTarget;
+                    },
+                  });
+                  // oxlint-disable-next-line no-empty
+                } catch {}
+              }
               execCallback = true;
               call_this = $target;
               call_event = event;
@@ -491,10 +518,15 @@ class ElementEvent extends ElementAnimate {
      * @param option
      */
     const getOption = function (args1: IArguments, startIndex: number, option: EventListenerOptions) {
-      const currentParam: EventListenerOptions | boolean = args1[startIndex];
+      const currentParam: boolean | DOMUtilsEventListenerOption = args1[startIndex];
       if (typeof currentParam === "boolean") {
         option.capture = currentParam;
-      } else if (typeof currentParam === "object" && currentParam != null && "capture" in currentParam) {
+      } else if (
+        currentParam &&
+        typeof currentParam === "object" &&
+        currentParam != null &&
+        "capture" in currentParam
+      ) {
         option.capture = currentParam.capture;
       }
       return option;

package/src/types/DOMUtilsEvent.d.ts

@@ -366,12 +366,26 @@ export declare interface DOMUtilsEventListenerOptionsAttribute {
  */
 export declare type DOMUtilsEventListenerOption = AddEventListenerOptions & {
   /**
-   * 是否使用 event.composedPath() 来代替 event.target
+   * 前提：传入了`selector`参数
    *
-   * 一般用于设置了selector参数
+   * 是否使用 event.composedPath() 来代替 event.target
    * @default false
    */
   isComposedPath?: boolean;
+  /**
+   * 前提：传入了`selector`参数
+   *
+   * 是否覆写`target`，仅传入了子元素的`selectorTarget`时才会生效
+   *
+   * 原始的`target`将命名为`originTarget`
+   * @default true
+   */
+  overrideTarget?: boolean;
+  /**
+   * 是否阻止事件传播，包括阻止默认行为
+   * @default false
+   */
+  isPreventEvent?: boolean;
 };
 export declare type DOMUtilsElementEventType =
   | HTMLElement