@whitesev/domutils 1.6.1 → 1.6.3

package/src/DOMUtils.ts

@@ -295,7 +295,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * DOMUtils.text("a.xx","abcd")
 	 * DOMUtils.text("a.xx",document.querySelector("b"))
 	 * */
-	text(element: DOMUtilsTargetElementType): string;
+	text(element: DOMUtilsTargetElementType | Element | DocumentFragment | Node): string;
 	/**
 	 * 设置元素的文本内容
 	 * @param element 目标元素
@@ -308,10 +308,10 @@ class DOMUtils extends DOMUtilsEvent {
 	 * DOMUtils.text("a.xx",document.querySelector("b"))
 	 * */
 	text(
-		element: DOMUtilsTargetElementType | DocumentFragment,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Node,
 		text: string | HTMLElement | Element | number
 	): void;
-	text(element: DOMUtilsTargetElementType | DocumentFragment, text?: any) {
+	text(element: DOMUtilsTargetElementType | Element | DocumentFragment | Node, text?: any) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
 			element = DOMUtilsContext.selectorAll(element);
@@ -713,7 +713,13 @@ class DOMUtils extends DOMUtilsEvent {
 		if (typeof newElement === "string") {
 			newElement = DOMUtilsContext.parseHTML(newElement, false, false);
 		}
-		element!.parentElement!.replaceChild(newElement as Node, element);
+		let $parent = element.parentElement;
+		if ($parent) {
+			$parent.replaceChild(newElement as Node, element);
+		} else {
+			DOMUtilsContext.after(element, newElement as HTMLElement);
+			element.remove();
+		}
 	}
 	/**
 	 * 给元素添加class
@@ -962,7 +968,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * DOMUtils.remove(document.querySelectorAll("a.xx"))
 	 * DOMUtils.remove("a.xx")
 	 * */
-	remove(element: DOMUtilsTargetElementType) {
+	remove(element: DOMUtilsTargetElementType | Element) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
 			element = DOMUtilsContext.selectorAll(element);
@@ -976,7 +982,13 @@ class DOMUtils extends DOMUtilsEvent {
 			});
 			return;
 		}
-		element.remove();
+		if (typeof element.remove === "function") {
+			element.remove();
+		} else if (element.parentElement) {
+			element.parentElement.removeChild(element);
+		} else if (element.parentNode) {
+			element.parentNode.removeChild(element);
+		}
 	}
 	/**
 	 * 移除元素的所有子元素
@@ -986,7 +998,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * DOMUtils.empty(document.querySelector("a.xx"))
 	 * DOMUtils.empty("a.xx")
 	 * */
-	empty(element: DOMUtilsTargetElementType) {
+	empty(element: DOMUtilsTargetElementType | Element) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
 			element = DOMUtilsContext.selectorAll(element);
@@ -1001,7 +1013,11 @@ class DOMUtils extends DOMUtilsEvent {
 			});
 			return;
 		}
-		DOMUtilsContext.html(element, "");
+		if (element.innerHTML) {
+			element.innerHTML = "";
+		} else if (element.textContent) {
+			element.textContent = "";
+		}
 	}
 	/**
 	 * 获取元素相对于文档的偏移坐标（加上文档的滚动条）
@@ -1496,7 +1512,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * DOMUtils.parent("a.xx")
 	 * > <div ...>....</div>
 	 */
-	parent(element: HTMLElement | NodeList | string | HTMLElement[]) {
+	parent(element: HTMLElement | Element | Node | NodeList | string | HTMLElement[]) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
 			element = DOMUtilsContext.selector<HTMLElement>(element)!;

package/src/DOMUtilsEvent.ts

@@ -728,7 +728,14 @@ export class DOMUtilsEvent {
 	 * DOMUtils.trigger("a.xx",["click","tap","hover"])
 	 */
 	trigger(
-		element: DOMUtilsTargetElementType | any[] | typeof globalThis | Window | Document,
+		element:
+			| DOMUtilsTargetElementType
+			| Element
+			| DocumentFragment
+			| any[]
+			| typeof globalThis
+			| Window
+			| Document,
 		eventType: string,
 		details?: object,
 		useDispatchToTriggerEvent?: boolean
@@ -835,7 +842,7 @@ export class DOMUtilsEvent {
 	 * })
 	 * */
 	click(
-		element: DOMUtilsTargetElementType | typeof globalThis | Window,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | typeof globalThis | Window,
 		handler?: (this: HTMLElement, event: DOMUtils_Event["click"]) => void,
 		details?: any,
 		useDispatchToTriggerEvent?: boolean
@@ -875,14 +882,14 @@ export class DOMUtilsEvent {
 	 * })
 	 * */
 	blur(
-		element: DOMUtilsTargetElementType | typeof globalThis | Window,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | typeof globalThis | Window,
 		handler?: (this: HTMLElement, event: DOMUtils_Event["blur"]) => void,
 		details?: object,
 		useDispatchToTriggerEvent?: boolean
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.selectorAll<HTMLElement>(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -915,14 +922,14 @@ export class DOMUtilsEvent {
 	 * })
 	 * */
 	focus(
-		element: DOMUtilsTargetElementType | typeof globalThis | Window,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | typeof globalThis | Window,
 		handler?: (this: HTMLElement, event: DOMUtils_Event["focus"]) => void,
 		details?: object,
 		useDispatchToTriggerEvent?: boolean
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.selectorAll<HTMLElement>(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -955,13 +962,13 @@ export class DOMUtilsEvent {
 	 * })
 	 */
 	hover(
-		element: DOMUtilsTargetElementType,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Node,
 		handler: (this: HTMLElement, event: DOMUtils_Event["hover"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.selectorAll<HTMLElement>(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -983,24 +990,24 @@ export class DOMUtilsEvent {
 	 * @param option 配置项，这里默认配置once为true
 	 */
 	animationend(
-		element: HTMLElement | string,
+		element: HTMLElement | string | Element | DocumentFragment,
 		handler: (this: HTMLElement, event: DOMUtils_Event["animationend"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.selector<HTMLElement>(element)!;
+			element = DOMUtilsContext.selector(element)!;
 		}
 		if (element == null) {
 			return;
 		}
-		if (DOMUtilsCommonUtils.isNodeList(element)) {
-			// 设置
-			element.forEach(($ele) => {
-				DOMUtilsContext.animationend($ele as HTMLElement, handler, option);
-			});
-			return;
-		}
+		// if (DOMUtilsCommonUtils.isNodeList(element)) {
+		// 	// 设置
+		// 	element.forEach(($ele) => {
+		// 		DOMUtilsContext.animationend($ele as HTMLElement, handler, option);
+		// 	});
+		// 	return;
+		// }
 		const defaultOption: DOMUtilsEventListenerOption = {
 			once: true,
 		};
@@ -1022,24 +1029,24 @@ export class DOMUtilsEvent {
 	 * @param option 配置项，这里默认配置once为true
 	 */
 	transitionend(
-		element: HTMLElement | string,
+		element: HTMLElement | string | Element | DocumentFragment,
 		handler: (this: HTMLElement, event: DOMUtils_Event["transitionend"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.selector<HTMLElement>(element)!;
+			element = DOMUtilsContext.selector(element)!;
 		}
 		if (element == null) {
 			return;
 		}
-		if (DOMUtilsCommonUtils.isNodeList(element)) {
-			// 设置
-			element.forEach(($ele) => {
-				DOMUtilsContext.transitionend($ele as HTMLElement, handler, option);
-			});
-			return;
-		}
+		// if (DOMUtilsCommonUtils.isNodeList(element)) {
+		// 	// 设置
+		// 	element.forEach(($ele) => {
+		// 		DOMUtilsContext.transitionend($ele as HTMLElement, handler, option);
+		// 	});
+		// 	return;
+		// }
 		const defaultOption: DOMUtilsEventListenerOption = {
 			once: true,
 		};
@@ -1070,7 +1077,7 @@ export class DOMUtilsEvent {
 	 * })
 	 */
 	keyup(
-		element: DOMUtilsTargetElementType | Window | typeof globalThis,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
 		handler: (this: HTMLElement, event: DOMUtils_Event["keyup"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
@@ -1106,7 +1113,7 @@ export class DOMUtilsEvent {
 	 * })
 	 */
 	keydown(
-		element: DOMUtilsTargetElementType | Window | typeof globalThis,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
 		handler: (this: HTMLElement, event: DOMUtils_Event["keydown"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
@@ -1142,7 +1149,7 @@ export class DOMUtilsEvent {
 	 * })
 	 */
 	keypress(
-		element: DOMUtilsTargetElementType | Window | typeof globalThis,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
 		handler: (this: HTMLElement, event: DOMUtils_Event["keypress"]) => void,
 		option?: boolean | DOMUtilsEventListenerOption
 	) {
@@ -1226,7 +1233,7 @@ export class DOMUtilsEvent {
       收藏		171
      **/
 	listenKeyboard(
-		element: DOMUtilsTargetElementType | Window | Node | typeof globalThis,
+		element: DOMUtilsTargetElementType | Element | DocumentFragment | Window | Node | typeof globalThis,
 		eventName: "keyup" | "keypress" | "keydown" = "keypress",
 		callback: (keyName: string, keyValue: number, otherCodeList: string[], event: KeyboardEvent) => void,
 		options?: DOMUtilsEventListenerOption | boolean