@whitesev/domutils 1.9.4 → 1.9.6

package/dist/index.system.js

@@ -3,7 +3,7 @@ System.register('DOMUtils', [], (function (exports) {
   return {
     execute: (function () {
 
-      const version = "1.9.4";
+      const version = "1.9.6";
 
       class WindowApi {
           /** 默认的配置 */
@@ -1934,7 +1934,8 @@ System.register('DOMUtils', [], (function (exports) {
                   that.emit(element, "click", details, useDispatchToEmit);
               }
               else {
-                  that.on(element, "click", null, handler);
+                  const listener = that.on(element, "click", null, handler);
+                  return listener;
               }
           }
           /**
@@ -1970,7 +1971,8 @@ System.register('DOMUtils', [], (function (exports) {
                   that.emit(element, "blur", details, useDispatchToEmit);
               }
               else {
-                  that.on(element, "blur", null, handler);
+                  const listener = that.on(element, "blur", null, handler);
+                  return listener;
               }
           }
           /**
@@ -2006,7 +2008,8 @@ System.register('DOMUtils', [], (function (exports) {
                   that.emit(element, "focus", details, useDispatchToEmit);
               }
               else {
-                  that.on(element, "focus", null, handler);
+                  const listener = that.on(element, "focus", null, handler);
+                  return listener;
               }
           }
           /**
@@ -2033,13 +2036,30 @@ System.register('DOMUtils', [], (function (exports) {
               }
               if (CommonUtils.isNodeList(element)) {
                   // 设置
+                  const listenerList = [];
                   element.forEach(($ele) => {
-                      that.onHover($ele, handler, option);
+                      const listener = that.onHover($ele, handler, option);
+                      listenerList.push(listener);
                   });
-                  return;
+                  return {
+                      off() {
+                          listenerList.forEach((listener) => {
+                              if (!listener) {
+                                  return;
+                              }
+                              listener.off();
+                          });
+                      },
+                  };
               }
-              that.on(element, "mouseenter", null, handler, option);
-              that.on(element, "mouseleave", null, handler, option);
+              const mouseenter_listener = that.on(element, "mouseenter", null, handler, option);
+              const mouseleave_listener = that.on(element, "mouseleave", null, handler, option);
+              return {
+                  off() {
+                      mouseenter_listener.off();
+                      mouseleave_listener.off();
+                  },
+              };
           }
           /**
            * 监听动画结束
@@ -2122,12 +2142,23 @@ System.register('DOMUtils', [], (function (exports) {
               }
               if (CommonUtils.isNodeList(element)) {
                   // 设置
+                  const listenerList = [];
                   element.forEach(($ele) => {
-                      that.onKeyup($ele, handler, option);
+                      const listener = that.onKeyup($ele, handler, option);
+                      listenerList.push(listener);
                   });
-                  return;
+                  return {
+                      off() {
+                          listenerList.forEach((listener) => {
+                              if (!listener) {
+                                  return;
+                              }
+                              listener.off();
+                          });
+                      },
+                  };
               }
-              that.on(element, "keyup", null, handler, option);
+              return that.on(element, "keyup", null, handler, option);
           }
           /**
            * 当按键按下时触发事件
@@ -2154,12 +2185,23 @@ System.register('DOMUtils', [], (function (exports) {
               }
               if (CommonUtils.isNodeList(element)) {
                   // 设置
+                  const listenerList = [];
                   element.forEach(($ele) => {
-                      that.onKeydown($ele, handler, option);
+                      const listener = that.onKeydown($ele, handler, option);
+                      listenerList.push(listener);
                   });
-                  return;
+                  return {
+                      off() {
+                          listenerList.forEach((listener) => {
+                              if (!listener) {
+                                  return;
+                              }
+                              listener.off();
+                          });
+                      },
+                  };
               }
-              that.on(element, "keydown", null, handler, option);
+              return that.on(element, "keydown", null, handler, option);
           }
           /**
            * 当按键按下时触发事件
@@ -2186,12 +2228,23 @@ System.register('DOMUtils', [], (function (exports) {
               }
               if (CommonUtils.isNodeList(element)) {
                   // 设置
+                  const listenerList = [];
                   element.forEach(($ele) => {
-                      that.onKeypress($ele, handler, option);
+                      const listener = that.onKeypress($ele, handler, option);
+                      listenerList.push(listener);
                   });
-                  return;
+                  return {
+                      off() {
+                          listenerList.forEach((listener) => {
+                              if (!listener) {
+                                  return;
+                              }
+                              listener.off();
+                          });
+                      },
+                  };
               }
-              that.on(element, "keypress", null, handler, option);
+              return that.on(element, "keypress", null, handler, option);
           }
           /**
            * 监听某个元素键盘按键事件或window全局按键事件
@@ -2284,12 +2337,8 @@ System.register('DOMUtils', [], (function (exports) {
                       handler(keyName, keyValue, otherCodeList, event);
                   }
               };
-              that.on(element, eventName, keyboardEventCallBack, options);
-              return {
-                  removeListen: () => {
-                      that.off(element, eventName, keyboardEventCallBack, options);
-                  },
-              };
+              const listener = that.on(element, eventName, keyboardEventCallBack, options);
+              return listener;
           }
           /**
            * 监input、textarea的输入框值改变的事件（当输入法输入时，不会触发该监听）
@@ -2320,11 +2369,14 @@ System.register('DOMUtils', [], (function (exports) {
               const compositionStartListener = this.on($el, "compositionstart", __composition_start_callback, option);
               const compositionEndListener = this.on($el, "compositionend", __composition_end_callback, option);
               return {
-                  off: () => {
+                  off() {
                       inputListener.off();
                       compositionStartListener.off();
                       compositionEndListener.off();
                   },
+                  emit(details, useDispatchToEmit) {
+                      inputListener.emit(details, useDispatchToEmit);
+                  },
               };
           }
           onDoubleClick(...args) {
@@ -2358,41 +2410,26 @@ System.register('DOMUtils', [], (function (exports) {
               else {
                   throw new Error("args length error");
               }
-              let $click = null;
+              let clickMap = new WeakMap();
               let isDoubleClick = false;
               let timer = void 0;
-              /** 是否是移动端点击 */
-              let isMobileTouch = false;
               /** 检测是否是单击的延迟时间 */
               const checkClickTime = 200;
-              const dblclick_handler = async (evt, option, $selector) => {
-                  if (evt.type === "dblclick" && isMobileTouch) {
-                      // 禁止在移动端触发dblclick事件
-                      return;
-                  }
+              const dblclick_handler = (evt, option, $selector) => {
                   if ($selector) {
-                      await handler(evt, $selector, option);
+                      return handler(evt, $selector, option);
                   }
                   else {
-                      await handler(evt, option);
+                      return handler(evt, option);
                   }
               };
-              const dblClickListener = this.on($el, "dblclick", selector, (evt, $selector) => {
-                  this.preventEvent(evt);
-                  dblclick_handler(evt, {
-                      isDoubleClick: true,
-                  }, $selector);
-              }, options);
               const pointerUpListener = this.on($el, "pointerup", selector, (evt, $selector) => {
-                  this.preventEvent(evt);
-                  if (evt.pointerType === "touch") {
-                      isMobileTouch = true;
-                  }
+                  // this.preventEvent(evt);
                   clearTimeout(timer);
                   timer = void 0;
-                  if (isDoubleClick && $click === $selector) {
+                  if (isDoubleClick && clickMap.has($selector)) {
                       isDoubleClick = false;
-                      $click = null;
+                      clickMap.delete($selector);
                       /* 判定为双击 */
                       dblclick_handler(evt, {
                           isDoubleClick: true,
@@ -2407,14 +2444,14 @@ System.register('DOMUtils', [], (function (exports) {
                           }, $selector);
                       }, checkClickTime);
                       isDoubleClick = true;
-                      $click = $selector;
+                      clickMap.set($selector, evt);
                   }
               }, options);
               return {
                   off() {
-                      $click = null;
-                      dblClickListener.off();
                       pointerUpListener.off();
+                      // @ts-expect-error
+                      clickMap = null;
                   },
               };
           }
@@ -2422,28 +2459,56 @@ System.register('DOMUtils', [], (function (exports) {
               /**
                * 阻止事件的默认行为发生，并阻止事件传播
                */
-              const stopEvent = (event) => {
-                  /* 阻止事件的默认行为发生。例如，当点击一个链接时，浏览器会默认打开链接的URL */
+              const stopEvent = (event, onlyStopPropagation) => {
+                  if (typeof onlyStopPropagation === "boolean" && onlyStopPropagation) {
+                      // 停止事件的传播，阻止它继续向更上层的元素冒泡，事件将不会再传播给其他的元素
+                      event?.stopPropagation();
+                      // 阻止事件传播，并且还能阻止元素上的其他事件处理程序被触发
+                      event?.stopImmediatePropagation();
+                      return;
+                  }
+                  // 阻止事件的默认行为发生。例如，当点击一个链接时，浏览器会默认打开链接的URL，或者在输入框内输入文字
                   event?.preventDefault();
-                  /* 停止事件的传播，阻止它继续向更上层的元素冒泡，事件将不会再传播给其他的元素 */
-                  event?.stopPropagation();
-                  /* 阻止事件传播，并且还能阻止元素上的其他事件处理程序被触发 */
-                  event?.stopImmediatePropagation();
                   return false;
               };
-              if (args.length === 1) {
-                  /* 直接阻止事件 */
-                  return stopEvent(args[0]);
+              if (args[0] instanceof Event) {
+                  // 直接阻止事件
+                  const onlyStopPropagation = args[1];
+                  return stopEvent(args[0], onlyStopPropagation);
               }
               else {
                   const $el = args[0];
                   let eventNameList = args[1];
-                  const capture = args[2];
-                  /* 添加对应的事件来阻止触发 */
+                  let selector = void 0;
+                  let capture = false;
+                  let onlyStopPropagation = false;
+                  // 添加对应的事件来阻止触发
                   if (typeof eventNameList === "string") {
                       eventNameList = [eventNameList];
                   }
-                  this.on($el, eventNameList, stopEvent, { capture: Boolean(capture) });
+                  let option = void 0;
+                  if (typeof args[2] === "string" || Array.isArray(args[2])) {
+                      // selector
+                      selector = args[2];
+                      if (typeof args[3] === "object" && args[3] != null) {
+                          option = args[3];
+                      }
+                  }
+                  else if (typeof args[2] === "object" && args[2] != null && !Array.isArray(args[2])) {
+                      // option
+                      option = args[2];
+                  }
+                  else {
+                      throw new TypeError("Invalid argument");
+                  }
+                  if (option) {
+                      capture = Boolean(option.capture);
+                      onlyStopPropagation = Boolean(option.onlyStopPropagation);
+                  }
+                  const listener = this.on($el, eventNameList, selector, (evt) => {
+                      return stopEvent(evt, onlyStopPropagation);
+                  }, { capture: capture });
+                  return listener;
               }
           }
       }