@whitesev/domutils 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/domutils",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "使用js重新对jQuery的部分函数进行了仿写",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/DOMUtils.ts

@@ -20,7 +20,7 @@ class DOMUtils extends DOMUtilsEvent {
 		super(option);
 	}
 	/** 版本号 */
-	version = "2025.3.2";
+	version = "2025.4.23";
 	/**
 	 * 获取元素的属性值
 	 * @param element 目标元素
@@ -280,36 +280,37 @@ class DOMUtils extends DOMUtilsEvent {
 			}
 			return;
 		}
+		let setStyleProperty = (
+			propertyName: string,
+			propertyValue: string | number
+		) => {
+			if (propertyValue === "string" && propertyValue.includes("!important")) {
+				propertyValue = propertyValue
+					.trim()
+					.replace(/!important$/gi, "")
+					.trim();
+				element.style.setProperty(propertyName, propertyValue, "important");
+			} else {
+				propertyValue = handlePixe(propertyName, propertyValue);
+				element.style.setProperty(propertyName, propertyValue);
+			}
+		};
 		if (typeof property === "string") {
 			if (value == null) {
 				return DOMUtilsContext.windowApi.globalThis
 					.getComputedStyle(element)
 					.getPropertyValue(property);
 			} else {
-				if (value === "string" && value.includes("!important")) {
-					element.style.setProperty(property, value, "important");
-				} else {
-					value = handlePixe(property, value);
-					element.style.setProperty(property, value);
-				}
+				setStyleProperty(property, value);
 			}
 		} else if (typeof property === "object") {
 			for (let prop in property) {
-				if (
-					typeof property[prop] === "string" &&
-					(property[prop] as string).includes("!important")
-				) {
-					element.style.setProperty(
-						prop,
-						property[prop] as string,
-						"important"
-					);
-				} else {
-					property[prop] = handlePixe(prop, property[prop] as string);
-					element.style.setProperty(prop, property[prop] as string);
-				}
+				let value = property[prop];
+				setStyleProperty(prop, value!);
 			}
 		} else {
+			// 其他情况
+			throw new TypeError("property must be string or object");
 		}
 	}
 	/**

package/src/DOMUtilsEvent.ts

@@ -271,19 +271,22 @@ export class DOMUtilsEvent {
 					let eventTarget = listenerOption.isComposedPath
 						? (event.composedPath()[0] as HTMLElement)
 						: (event.target as HTMLElement);
-					let totalParent = DOMUtilsCommonUtils.isWin(elementItem)
-						? DOMUtilsContext.windowApi.document.documentElement
-						: elementItem;
+					let totalParent =
+						DOMUtilsCommonUtils.isWin(elementItem) ||
+						// @ts-ignore
+						elementItem === DOMUtilsContext.windowApi.document
+							? DOMUtilsContext.windowApi.document.documentElement
+							: elementItem;
 					let findValue = selectorList.find((selectorItem) => {
 						// 判断目标元素是否匹配选择器
-						if (eventTarget.matches(selectorItem)) {
+						if (eventTarget?.matches(selectorItem)) {
 							/* 当前目标可以被selector所匹配到 */
 							return true;
 						}
 						/* 在上层与主元素之间寻找可以被selector所匹配到的 */
 						let $closestMatches =
-							eventTarget.closest<HTMLElement>(selectorItem);
-						if ($closestMatches && totalParent.contains($closestMatches)) {
+							eventTarget?.closest<HTMLElement>(selectorItem);
+						if ($closestMatches && totalParent?.contains($closestMatches)) {
 							eventTarget = $closestMatches;
 							return true;
 						}