@whitesev/domutils 1.5.1 → 1.5.3

package/dist/index.umd.js

@@ -84,22 +84,7 @@
          */
         setSafeHTML($el, text) {
             // 创建 TrustedHTML 策略（需 CSP 允许）
-            try {
-                $el.innerHTML = text;
-            }
-            catch (error) {
-                // @ts-ignore
-                if (globalThis.trustedTypes) {
-                    // @ts-ignore
-                    const policy = globalThis.trustedTypes.createPolicy("safe-innerHTML", {
-                        createHTML: (html) => html,
-                    });
-                    $el.innerHTML = policy.createHTML(text);
-                }
-                else {
-                    throw new Error("trustedTypes is not defined");
-                }
-            }
+            $el.innerHTML = this.getSafeHTML(text);
         },
         /**
          * 用于显示元素并获取它的高度宽度等其它属性
@@ -314,18 +299,20 @@
                         let eventTarget = listenerOption.isComposedPath
                             ? event.composedPath()[0]
                             : event.target;
-                        let totalParent = DOMUtilsCommonUtils.isWin(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(selectorItem);
-                            if ($closestMatches && totalParent.contains($closestMatches)) {
+                            let $closestMatches = eventTarget?.closest(selectorItem);
+                            if ($closestMatches && totalParent?.contains($closestMatches)) {
                                 eventTarget = $closestMatches;
                                 return true;
                             }
@@ -1079,7 +1066,7 @@
             super(option);
         }
         /** 版本号 */
-        version = "2025.3.2";
+        version = "2025.4.23";
         attr(element, attrName, attrValue) {
             let DOMUtilsContext = this;
             if (typeof element === "string") {
@@ -1222,6 +1209,19 @@
                 else ;
                 return;
             }
+            let setStyleProperty = (propertyName, propertyValue) => {
+                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
@@ -1229,28 +1229,19 @@
                         .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].includes("!important")) {
-                        element.style.setProperty(prop, property[prop], "important");
-                    }
-                    else {
-                        property[prop] = handlePixe(prop, property[prop]);
-                        element.style.setProperty(prop, property[prop]);
-                    }
+                    let value = property[prop];
+                    setStyleProperty(prop, value);
                 }
             }
-            else ;
+            else {
+                // 其他情况
+                throw new TypeError("property must be string or object");
+            }
         }
         text(element, text) {
             let DOMUtilsContext = this;