@whitesev/domutils 1.9.7 → 1.9.9

package/src/ElementEvent.ts

@@ -533,15 +533,6 @@ class ElementEvent extends ElementAnimate {
       // 这是存在selector的情况
       listenerOption = getOption(args, 4, listenerOption);
     }
-    // 是否移除所有事件
-    let isRemoveAll = false;
-    if (args.length === 2) {
-      // 目标函数、事件名
-      isRemoveAll = true;
-    } else if ((args.length === 3 && typeof args[2] === "string") || Array.isArray(args[2])) {
-      // 目标函数、事件名、子元素选择器
-      isRemoveAll = true;
-    }
     if (args.length === 5 && typeof args[4] === "function" && typeof filter !== "function") {
       // 目标函数、事件名、回调函数、事件配置、过滤函数
       filter = option as (
@@ -579,7 +570,7 @@ class ElementEvent extends ElementAnimate {
             // 事件的配置项不同
             flag = false;
           }
-          if (flag || isRemoveAll) {
+          if (flag) {
             $elItem.removeEventListener(eventName, handler.handlerCallBack, handler.option);
             const findIndex = handlers.findIndex((item) => item === handler);
             if (findIndex !== -1) {
@@ -1283,53 +1274,6 @@ class ElementEvent extends ElementAnimate {
     }
     return that.on(element, "keydown", null, handler, option);
   }
-  /**
-   * 当按键按下时触发事件
-   * keydown - > keypress - > keyup
-   * @param element 目标
-   * @param handler 事件处理函数
-   * @param option 配置
-   * @example
-   * // 监听a.xx元素的按键按下
-   * DOMUtils.keypress(document.querySelector("a.xx"),()=>{
-   *   console.log("按键按下");
-   * })
-   * DOMUtils.keypress("a.xx",()=>{
-   *   console.log("按键按下");
-   * })
-   */
-  onKeypress(
-    element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
-    handler: (this: HTMLElement, event: DOMUtils_Event["keypress"]) => void,
-    option?: boolean | DOMUtilsEventListenerOption
-  ) {
-    const that = this;
-    if (element == null) {
-      return;
-    }
-    if (typeof element === "string") {
-      element = that.selectorAll(element);
-    }
-    if (CommonUtils.isNodeList(element)) {
-      // 设置
-      const listenerList: (DOMUtilsAddEventListenerResult | undefined)[] = [];
-      element.forEach(($ele) => {
-        const listener = that.onKeypress($ele as HTMLElement, handler, option);
-        listenerList.push(listener);
-      });
-      return {
-        off() {
-          listenerList.forEach((listener) => {
-            if (!listener) {
-              return;
-            }
-            listener.off();
-          });
-        },
-      } as DOMUtilsAddEventListenerResult;
-    }
-    return that.on(element, "keypress", null, handler, option);
-  }
   /**
    * 监听某个元素键盘按键事件或window全局按键事件
    * 按下有值的键时触发，按下Ctrl\Alt\Shift\Meta是无值键。按下先触发keydown事件，再触发keypress事件。
@@ -1395,7 +1339,7 @@ class ElementEvent extends ElementAnimate {
     **/
   onKeyboard(
     element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
-    eventName: "keydown" | "keypress" | "keyup" = "keypress",
+    eventName: "keydown" | "keyup" = "keydown",
     handler: (keyName: string, keyValue: number, otherCodeList: string[], event: KeyboardEvent) => void,
     options?: DOMUtilsEventListenerOption | boolean
   ): DOMUtilsAddEventListenerResult {
@@ -1715,7 +1659,9 @@ class ElementEvent extends ElementAnimate {
             onlyStopPropagation?: boolean;
           }
         | undefined = void 0;
-      if (typeof args[2] === "string" || Array.isArray(args[2])) {
+      if (args.length === 2) {
+        // ignore
+      } else if (typeof args[2] === "string" || Array.isArray(args[2])) {
         // selector
         selector = args[2];
         if (typeof args[3] === "object" && args[3] != null) {

package/src/Utils.ts

@@ -103,7 +103,6 @@ class Utils {
         "is",
         "jquery",
         "keydown",
-        "keypress",
         "keyup",
         "last",
         "load",

package/src/types/DOMUtilsEvent.d.ts

@@ -47,7 +47,12 @@ export type DOMUtils_MouseEventType = keyof DOMUtils_MouseEvent;
 export interface DOMUtils_KeyboardEvent {
   /** 键盘按下事件 */
   keydown: KeyboardEvent;
-  /** 键盘按压事件(字符键) */
+  /**
+   * 键盘按压事件(字符键)
+   *
+   * @link https://developer.mozilla.org/zh-CN/docs/Web/API/Element/keypress_event
+   * @deprecated
+   */
   keypress: KeyboardEvent;
   /** 键盘释放事件 */
   keyup: KeyboardEvent;