@domql/utils 2.5.151 → 2.5.152

package/component.js

@@ -6,10 +6,8 @@ import {
   isArray,
   isFunction,
   isObject,
-  isObjectLike,
   isString,
-  joinArrays,
-  overwriteDeep
+  joinArrays
 } from '.'
 const ENV = process.env.NODE_ENV
 
@@ -109,20 +107,24 @@ export const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i]
     const childElem = element[childKey]
     const newChild = element.props[childKey]
+
+    const assignChild = (val) => {
+      element[childKey] = val
+      delete element.props[childKey]
+    }
+
     if (newChild?.ignoreExtend) continue
-    if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
+    if (newChild === null && childElem) {
+      console.log('is null', element)
+      assignChild(null)
+    } else if (!childElem) assignChild(deepCloneWithExtend(newChild))
     else {
-      const isSugar = checkIfSugar(childElem, parent, key)
-      if (!isSugar) continue
-      const inheritedChildElem = element[childKey].props
-      if (isObjectLike(newChild)) {
-        overwriteDeep(inheritedChildElem, newChild)
-      } else if (isFunction(newChild)) {
-        element[childKey] = {
-          extend: element[childKey],
-          props: newChild
-        }
-      }
+      const isSugarChildElem = checkIfSugar(childElem, parent, key)
+      if (isSugarChildElem) continue
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      })
     }
   }
 }

package/dist/cjs/component.js

@@ -121,23 +121,25 @@ const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i];
     const childElem = element[childKey];
     const newChild = element.props[childKey];
+    const assignChild = (val) => {
+      element[childKey] = val;
+      delete element.props[childKey];
+    };
     if (newChild == null ? void 0 : newChild.ignoreExtend)
       continue;
-    if (!childElem)
-      element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+    if (newChild === null && childElem) {
+      console.log("is null", element);
+      assignChild(null);
+    } else if (!childElem)
+      assignChild((0, import__.deepCloneWithExtend)(newChild));
     else {
-      const isSugar = checkIfSugar(childElem, parent, key);
-      if (!isSugar)
+      const isSugarChildElem = checkIfSugar(childElem, parent, key);
+      if (isSugarChildElem)
         continue;
-      const inheritedChildElem = element[childKey].props;
-      if ((0, import__.isObjectLike)(newChild)) {
-        (0, import__.overwriteDeep)(inheritedChildElem, newChild);
-      } else if ((0, import__.isFunction)(newChild)) {
-        element[childKey] = {
-          extend: element[childKey],
-          props: newChild
-        };
-      }
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      });
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.151",
+  "version": "2.5.152",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -25,7 +25,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "f37b51f84b8bca80b8bce7887e83d61ac25eb3d5",
+  "gitHead": "249d2545f3ee35b450ca90d399fc7c3e54a4a7bc",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }