@whitesev/pops 1.1.0 → 1.2.1

package/dist/index.esm.js

@@ -1489,6 +1489,12 @@ class PopsUtils {
     }
     assign(target = {}, source = {}, isAdd = false) {
         let UtilsContext = this;
+        if (source == null) {
+            return target;
+        }
+        if (target == null) {
+            target = {};
+        }
         if (Array.isArray(source)) {
             let canTraverse = source.filter((item) => {
                 return typeof item === "object";
@@ -1502,8 +1508,9 @@ class PopsUtils {
                 const targetKeyName = sourceKeyName;
                 let targetValue = target[targetKeyName];
                 let sourceValue = source[sourceKeyName];
-                if (sourceKeyName in target &&
-                    typeof sourceValue === "object" &&
+                if (typeof sourceValue === "object" &&
+                    sourceValue != null &&
+                    sourceKeyName in target &&
                     !UtilsContext.isDOM(sourceValue)) {
                     /* 源端的值是object类型，且不是元素节点 */
                     target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
@@ -1518,6 +1525,7 @@ class PopsUtils {
                     let targetValue = target[targetKeyName];
                     let sourceValue = source[targetKeyName];
                     if (typeof sourceValue === "object" &&
+                        sourceValue != null &&
                         !UtilsContext.isDOM(sourceValue) &&
                         Object.keys(sourceValue).length) {
                         /* 源端的值是object类型，且不是元素节点 */
@@ -8954,11 +8962,13 @@ class PopsRightClickMenu {
                 popsDOMUtils.on(globalThis, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
                     capture: true,
                 });
-                const $shadowRoot = config.target.getRootNode();
-                if ($shadowRoot instanceof ShadowRoot) {
-                    popsDOMUtils.on($shadowRoot, "click touchstart", void 0, PopsContextMenu.shadowRootCheckClickEvent, {
-                        capture: true,
-                    });
+                if (config.target instanceof Node) {
+                    const $shadowRoot = config.target.getRootNode();
+                    if ($shadowRoot instanceof ShadowRoot) {
+                        popsDOMUtils.on($shadowRoot, "click touchstart", void 0, PopsContextMenu.shadowRootCheckClickEvent, {
+                            capture: true,
+                        });
+                    }
                 }
             },
             /**
@@ -8968,11 +8978,13 @@ class PopsRightClickMenu {
                 popsDOMUtils.off(globalThis, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
                     capture: true,
                 });
-                const $shadowRoot = config.target.getRootNode();
-                if ($shadowRoot instanceof ShadowRoot) {
-                    popsDOMUtils.off($shadowRoot, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
-                        capture: true,
-                    });
+                if (config.target instanceof Node) {
+                    const $shadowRoot = config.target.getRootNode();
+                    if ($shadowRoot instanceof ShadowRoot) {
+                        popsDOMUtils.off($shadowRoot, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
+                            capture: true,
+                        });
+                    }
                 }
             },
             /**
@@ -9915,7 +9927,7 @@ class Pops {
     /** 配置 */
     config = {
         /** 版本号 */
-        version: "2024.7.8",
+        version: "2024.7.14",
         cssText: {
             /** 主CSS */
             index: indexCSS,