@whitesev/domutils 2.0.3 → 2.0.4

package/src/ElementEvent.ts

@@ -164,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") {
@@ -174,18 +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 ||
-          "overrideTarget" 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;
     };
@@ -264,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;
@@ -512,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,19 +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