@whitesev/pops 1.1.0 → 1.2.1

package/dist/index.umd.js

@@ -1495,6 +1495,12 @@
         }
         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";
@@ -1508,8 +1514,9 @@
                     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);
@@ -1524,6 +1531,7 @@
                         let targetValue = target[targetKeyName];
                         let sourceValue = source[targetKeyName];
                         if (typeof sourceValue === "object" &&
+                            sourceValue != null &&
                             !UtilsContext.isDOM(sourceValue) &&
                             Object.keys(sourceValue).length) {
                             /* 源端的值是object类型，且不是元素节点 */
@@ -8960,11 +8968,13 @@
                     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,
+                            });
+                        }
                     }
                 },
                 /**
@@ -8974,11 +8984,13 @@
                     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,
+                            });
+                        }
                     }
                 },
                 /**
@@ -9921,7 +9933,7 @@
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.7.8",
+            version: "2024.7.14",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,