@symbo.ls/scratch 2.11.450 → 2.11.464

package/dist/cjs/system/font.js

@@ -302,6 +302,8 @@ var require_array = __commonJS({
       arraysEqual: () => arraysEqual,
       cutArrayAfterValue: () => cutArrayAfterValue,
       cutArrayBeforeValue: () => cutArrayBeforeValue,
+      filterArrays: () => filterArrays,
+      filterArraysFast: () => filterArraysFast,
       getFrequencyInArray: () => getFrequencyInArray,
       joinArrays: () => joinArrays,
       mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -410,6 +412,13 @@ var require_array = __commonJS({
       }
       return true;
     };
+    var filterArrays = (sourceArr, excludeArr) => {
+      return sourceArr.filter((item) => !excludeArr.includes(item));
+    };
+    var filterArraysFast = (sourceArr, excludeArr) => {
+      const excludeSet = new Set(excludeArr);
+      return sourceArr.filter((item) => !excludeSet.has(item));
+    };
   }
 });
 
@@ -603,6 +612,7 @@ var require_object = __commonJS({
       diff: () => diff,
       diffArrays: () => diffArrays,
       diffObjects: () => diffObjects,
+      excludeKeysFromObject: () => excludeKeysFromObject,
       exec: () => exec,
       flattenRecursive: () => flattenRecursive,
       hasOwnProperty: () => hasOwnProperty,
@@ -758,10 +768,10 @@ var require_object = __commonJS({
       return o;
     };
     var deepStringify = (obj, stringified = {}) => {
-      var _a;
+      var _a, _b;
       if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
-        console.warn("Trying to clone element or state at", obj);
-        obj = (_a = obj.parse) == null ? void 0 : _a.call(obj);
+        (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+        obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
       }
       for (const prop in obj) {
         const objProp = obj[prop];
@@ -831,7 +841,7 @@ var require_object = __commonJS({
         if ((0, import_types.isArray)(value)) {
           str += "[\n";
           for (const element of value) {
-            if ((0, import_types.isObject)(element) && element !== null) {
+            if ((0, import_types.isObjectLike)(element) && element !== null) {
               str += `${spaces}    ${objectToString(element, indent + 2)},
 `;
             } else if ((0, import_types.isString)(element)) {
@@ -930,7 +940,7 @@ var require_object = __commonJS({
     };
     var stringToObject = (str, opts = { verbose: true }) => {
       try {
-        return import_globals2.window.eval("(" + str + ")");
+        return str ? import_globals2.window.eval("(" + str + ")") : {};
       } catch (e) {
         if (opts.verbose)
           console.warn(e);
@@ -1010,20 +1020,27 @@ var require_object = __commonJS({
         return acc;
       }, deletedValues);
     };
-    var overwrite = (element, params, excludeFrom = []) => {
-      const { ref } = element;
-      const changes = {};
+    var overwrite = (element, params, opts = {}) => {
+      const { __ref: ref } = element;
+      const excl = opts.exclude || [];
+      const allowUnderscore = opts.preventUnderscore;
+      const preventCaching = opts.preventCaching;
       for (const e in params) {
-        if (excludeFrom.includes(e) || e.startsWith("__"))
+        if (excl.includes(e) || !allowUnderscore && e.startsWith("__"))
           continue;
         const elementProp = element[e];
         const paramsProp = params[e];
-        if (paramsProp) {
-          ref.__cache[e] = changes[e] = elementProp;
-          ref[e] = paramsProp;
+        if (paramsProp !== void 0) {
+          element[e] = paramsProp;
+          if (ref && !preventCaching) {
+            ref.__cache[e] = elementProp;
+          }
+          if ((0, import_types.isObject)(opts.diff)) {
+            diff[e] = elementProp;
+          }
         }
       }
-      return changes;
+      return element;
     };
     var overwriteShallow = (obj, params, excludeFrom = []) => {
       for (const e in params) {
@@ -1033,23 +1050,26 @@ var require_object = __commonJS({
       }
       return obj;
     };
-    var overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+    var overwriteDeep = (obj, params, opts = {}, visited = /* @__PURE__ */ new WeakMap()) => {
+      const excl = opts.exclude || [];
+      const forcedExclude = opts.preventForce ? [] : ["node", "window"];
       if (!(0, import_types.isObjectLike)(obj) || !(0, import_types.isObjectLike)(params) || (0, import_node.isDOMNode)(obj) || (0, import_node.isDOMNode)(params)) {
         return params;
       }
-      if (visited.has(obj)) {
+      if (visited.has(obj))
         return visited.get(obj);
-      }
       visited.set(obj, obj);
       for (const e in params) {
-        if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
+        if (!Object.hasOwnProperty.call(params, e))
+          continue;
+        if (excl.includes(e) || forcedExclude && e.startsWith("__"))
           continue;
         const objProp = obj[e];
         const paramsProp = params[e];
         if ((0, import_node.isDOMNode)(paramsProp)) {
           obj[e] = paramsProp;
         } else if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-          obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited);
+          obj[e] = overwriteDeep(objProp, paramsProp, opts, visited);
         } else if (paramsProp !== void 0) {
           obj[e] = paramsProp;
         }
@@ -1231,6 +1251,11 @@ var require_object = __commonJS({
       }
       return detect(obj);
     };
+    var excludeKeysFromObject = (obj, excludedKeys) => {
+      const result = { ...obj };
+      excludedKeys.forEach((key) => delete result[key]);
+      return result;
+    };
   }
 });
 
@@ -1386,9 +1411,11 @@ var require_cookie = __commonJS({
     var cookie_exports = {};
     __export2(cookie_exports, {
       getCookie: () => getCookie,
+      getLocalStorage: () => getLocalStorage,
       isMobile: () => isMobile,
       removeCookie: () => removeCookie,
-      setCookie: () => setCookie
+      setCookie: () => setCookie,
+      setLocalStorage: () => setLocalStorage
     });
     module2.exports = __toCommonJS2(cookie_exports);
     var import_types = require_types();
@@ -1422,6 +1449,27 @@ var require_cookie = __commonJS({
         return;
       import_utils10.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
     };
+    function getLocalStorage(key) {
+      let savedJSON;
+      if (window.localStorage) {
+        try {
+          savedJSON = JSON.parse(window.localStorage.getItem(key));
+        } catch (e) {
+        }
+      }
+      if (typeof savedJSON !== "undefined") {
+        return savedJSON;
+      }
+    }
+    function setLocalStorage(key, data) {
+      if (data && window.localStorage) {
+        if (typeof data === "object") {
+          window.localStorage.setItem(key, JSON.stringify(data));
+        } else {
+          window.localStorage.setItem(key, data);
+        }
+      }
+    }
   }
 });
 
@@ -1625,7 +1673,9 @@ var require_component = __commonJS({
       applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
       checkIfKeyIsComponent: () => checkIfKeyIsComponent,
       checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+      checkIfSugar: () => checkIfSugar,
       extendizeByKey: () => extendizeByKey,
+      getCapitalCaseKeys: () => getCapitalCaseKeys,
       getChildrenComponentsByKey: () => getChildrenComponentsByKey,
       getExtendsInElement: () => getExtendsInElement,
       hasVariantProp: () => hasVariantProp,
@@ -1650,6 +1700,8 @@ var require_component = __commonJS({
       return /^[a-z]*$/.test(firstCharKey);
     };
     var addAdditionalExtend = (newExtend, element) => {
+      if (!newExtend)
+        return element;
       const { extend: elementExtend } = element;
       const originalArray = (0, import__.isArray)(elementExtend) ? elementExtend : [elementExtend];
       const receivedArray = (0, import__.isArray)(newExtend) ? newExtend : [newExtend];
@@ -1657,26 +1709,44 @@ var require_component = __commonJS({
       return { ...element, extend };
     };
     var checkIfSugar = (element, parent, key) => {
-      const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+      var _a;
+      const {
+        extend,
+        props,
+        childExtend,
+        extends: extendProps,
+        childExtends,
+        childProps,
+        children,
+        on,
+        $collection,
+        $stateCollection,
+        $propsCollection
+      } = element;
       const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-      return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+      if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+        const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+        if (logErr)
+          logErr.call(element, "Sugar component includes params for builtin components", { verbose: true });
+      }
+      return !hasComponentAttrs || childProps || extendProps || children || childExtends;
     };
     var extendizeByKey = (element, parent, key) => {
       const { context } = parent;
-      const { tag, extend, childrenExtends } = element;
-      const isSugar = checkIfSugar(element);
+      const { tag, extend, childExtends } = element;
+      const isSugar = checkIfSugar(element, parent, key);
       const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
       const isExtendKeyComponent = context && context.components[extendFromKey];
       if (element === isExtendKeyComponent)
         return element;
       else if (isSugar) {
-        const newElem = {
+        const newElem = addAdditionalExtend(element.extends, {
           extend: extendFromKey,
           tag,
           props: { ...element }
-        };
-        if (childrenExtends)
-          newElem.childExtend = childrenExtends;
+        });
+        if (childExtends)
+          newElem.childExtend = childExtends;
         return newElem;
       } else if (!extend || extend === true) {
         return {
@@ -1705,23 +1775,24 @@ var require_component = __commonJS({
         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)
+          assignChild(null);
+        else if (!childElem)
+          assignChild((0, import__.deepCloneWithExtend)(newChild));
         else {
-          const isSugar = checkIfSugar(childElem);
-          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
+          });
         }
       }
     };
@@ -2145,6 +2216,8 @@ var require_cjs2 = __commonJS({
           arraysEqual: () => arraysEqual,
           cutArrayAfterValue: () => cutArrayAfterValue,
           cutArrayBeforeValue: () => cutArrayBeforeValue,
+          filterArrays: () => filterArrays,
+          filterArraysFast: () => filterArraysFast,
           getFrequencyInArray: () => getFrequencyInArray,
           joinArrays: () => joinArrays,
           mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -2253,6 +2326,13 @@ var require_cjs2 = __commonJS({
           }
           return true;
         };
+        var filterArrays = (sourceArr, excludeArr) => {
+          return sourceArr.filter((item) => !excludeArr.includes(item));
+        };
+        var filterArraysFast = (sourceArr, excludeArr) => {
+          const excludeSet = new Set(excludeArr);
+          return sourceArr.filter((item) => !excludeSet.has(item));
+        };
       }
     });
     var require_string2 = __commonJS2({
@@ -2442,9 +2522,11 @@ var require_cjs2 = __commonJS({
           diff: () => diff,
           diffArrays: () => diffArrays,
           diffObjects: () => diffObjects,
+          excludeKeysFromObject: () => excludeKeysFromObject,
           exec: () => exec,
           flattenRecursive: () => flattenRecursive,
           hasOwnProperty: () => hasOwnProperty,
+          isCyclic: () => isCyclic,
           isEmpty: () => isEmpty,
           isEmptyObject: () => isEmptyObject,
           isEqualDeep: () => isEqualDeep,
@@ -2570,28 +2652,36 @@ var require_cjs2 = __commonJS({
           }
           return clone2;
         };
-        var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
+        var deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
+          if ((0, import_types.isObjectLike)(obj)) {
+            if (visited.has(obj)) {
+              return obj;
+            }
+            visited.add(obj);
+          }
           const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
           for (const prop in obj) {
             if (!Object.prototype.hasOwnProperty.call(obj, prop))
               continue;
             const objProp = obj[prop];
-            if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
+            if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
               continue;
+            }
             if ((0, import_types.isObjectLike)(objProp)) {
-              o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
+              o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
             } else if ((0, import_types.isFunction)(objProp) && options.window) {
               o[prop] = (options.window || import_globals2.window).eval("(" + objProp.toString() + ")");
-            } else
+            } else {
               o[prop] = objProp;
+            }
           }
           return o;
         };
         var deepStringify = (obj, stringified = {}) => {
-          var _a;
+          var _a, _b;
           if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
-            console.warn("Trying to clone element or state at", obj);
-            obj = (_a = obj.parse) == null ? void 0 : _a.call(obj);
+            (obj.__element || ((_a = obj.parent) == null ? void 0 : _a.__element)).warn("Trying to clone element or state at", obj);
+            obj = (_b = obj.parse) == null ? void 0 : _b.call(obj);
           }
           for (const prop in obj) {
             const objProp = obj[prop];
@@ -2661,7 +2751,7 @@ var require_cjs2 = __commonJS({
             if ((0, import_types.isArray)(value)) {
               str += "[\n";
               for (const element of value) {
-                if ((0, import_types.isObject)(element) && element !== null) {
+                if ((0, import_types.isObjectLike)(element) && element !== null) {
                   str += `${spaces}    ${objectToString(element, indent + 2)},
 `;
                 } else if ((0, import_types.isString)(element)) {
@@ -2760,7 +2850,7 @@ var require_cjs2 = __commonJS({
         };
         var stringToObject = (str, opts = { verbose: true }) => {
           try {
-            return import_globals2.window.eval("(" + str + ")");
+            return str ? import_globals2.window.eval("(" + str + ")") : {};
           } catch (e) {
             if (opts.verbose)
               console.warn(e);
@@ -2840,20 +2930,27 @@ var require_cjs2 = __commonJS({
             return acc;
           }, deletedValues);
         };
-        var overwrite = (element, params, excludeFrom = []) => {
-          const { ref } = element;
-          const changes = {};
+        var overwrite = (element, params, opts = {}) => {
+          const { __ref: ref } = element;
+          const excl = opts.exclude || [];
+          const allowUnderscore = opts.preventUnderscore;
+          const preventCaching = opts.preventCaching;
           for (const e in params) {
-            if (excludeFrom.includes(e) || e.startsWith("__"))
+            if (excl.includes(e) || !allowUnderscore && e.startsWith("__"))
               continue;
             const elementProp = element[e];
             const paramsProp = params[e];
-            if (paramsProp) {
-              ref.__cache[e] = changes[e] = elementProp;
-              ref[e] = paramsProp;
+            if (paramsProp !== void 0) {
+              element[e] = paramsProp;
+              if (ref && !preventCaching) {
+                ref.__cache[e] = elementProp;
+              }
+              if ((0, import_types.isObject)(opts.diff)) {
+                diff[e] = elementProp;
+              }
             }
           }
-          return changes;
+          return element;
         };
         var overwriteShallow = (obj, params, excludeFrom = []) => {
           for (const e in params) {
@@ -2863,23 +2960,26 @@ var require_cjs2 = __commonJS({
           }
           return obj;
         };
-        var overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+        var overwriteDeep = (obj, params, opts = {}, visited = /* @__PURE__ */ new WeakMap()) => {
+          const excl = opts.exclude || [];
+          const forcedExclude = opts.preventForce ? [] : ["node", "window"];
           if (!(0, import_types.isObjectLike)(obj) || !(0, import_types.isObjectLike)(params) || (0, import_node.isDOMNode)(obj) || (0, import_node.isDOMNode)(params)) {
             return params;
           }
-          if (visited.has(obj)) {
+          if (visited.has(obj))
             return visited.get(obj);
-          }
           visited.set(obj, obj);
           for (const e in params) {
-            if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
+            if (!Object.hasOwnProperty.call(params, e))
+              continue;
+            if (excl.includes(e) || forcedExclude && e.startsWith("__"))
               continue;
             const objProp = obj[e];
             const paramsProp = params[e];
             if ((0, import_node.isDOMNode)(paramsProp)) {
               obj[e] = paramsProp;
             } else if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-              obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited);
+              obj[e] = overwriteDeep(objProp, paramsProp, opts, visited);
             } else if (paramsProp !== void 0) {
               obj[e] = paramsProp;
             }
@@ -3042,6 +3142,30 @@ var require_cjs2 = __commonJS({
             }
           }
         };
+        var isCyclic = (obj) => {
+          const seenObjects = [];
+          function detect(obj2) {
+            if (obj2 && typeof obj2 === "object") {
+              if (seenObjects.indexOf(obj2) !== -1) {
+                return true;
+              }
+              seenObjects.push(obj2);
+              for (const key in obj2) {
+                if (Object.hasOwnProperty.call(obj2, key) && detect(obj2[key])) {
+                  console.log(obj2, "cycle at " + key);
+                  return true;
+                }
+              }
+            }
+            return false;
+          }
+          return detect(obj);
+        };
+        var excludeKeysFromObject = (obj, excludedKeys) => {
+          const result = { ...obj };
+          excludedKeys.forEach((key) => delete result[key]);
+          return result;
+        };
       }
     });
     var require_function2 = __commonJS2({
@@ -3191,9 +3315,11 @@ var require_cjs2 = __commonJS({
         var cookie_exports = {};
         __export22(cookie_exports, {
           getCookie: () => getCookie,
+          getLocalStorage: () => getLocalStorage,
           isMobile: () => isMobile,
           removeCookie: () => removeCookie,
-          setCookie: () => setCookie
+          setCookie: () => setCookie,
+          setLocalStorage: () => setLocalStorage
         });
         module22.exports = __toCommonJS22(cookie_exports);
         var import_types = require_types2();
@@ -3227,6 +3353,27 @@ var require_cjs2 = __commonJS({
             return;
           import_utils32.document.cookie = cname + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
         };
+        function getLocalStorage(key) {
+          let savedJSON;
+          if (window.localStorage) {
+            try {
+              savedJSON = JSON.parse(window.localStorage.getItem(key));
+            } catch (e) {
+            }
+          }
+          if (typeof savedJSON !== "undefined") {
+            return savedJSON;
+          }
+        }
+        function setLocalStorage(key, data) {
+          if (data && window.localStorage) {
+            if (typeof data === "object") {
+              window.localStorage.setItem(key, JSON.stringify(data));
+            } else {
+              window.localStorage.setItem(key, data);
+            }
+          }
+        }
       }
     });
     var require_tags2 = __commonJS2({
@@ -3426,7 +3573,9 @@ var require_cjs2 = __commonJS({
           applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
           checkIfKeyIsComponent: () => checkIfKeyIsComponent,
           checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+          checkIfSugar: () => checkIfSugar,
           extendizeByKey: () => extendizeByKey,
+          getCapitalCaseKeys: () => getCapitalCaseKeys,
           getChildrenComponentsByKey: () => getChildrenComponentsByKey,
           getExtendsInElement: () => getExtendsInElement,
           hasVariantProp: () => hasVariantProp,
@@ -3451,6 +3600,8 @@ var require_cjs2 = __commonJS({
           return /^[a-z]*$/.test(firstCharKey);
         };
         var addAdditionalExtend = (newExtend, element) => {
+          if (!newExtend)
+            return element;
           const { extend: elementExtend } = element;
           const originalArray = (0, import__.isArray)(elementExtend) ? elementExtend : [elementExtend];
           const receivedArray = (0, import__.isArray)(newExtend) ? newExtend : [newExtend];
@@ -3458,26 +3609,44 @@ var require_cjs2 = __commonJS({
           return { ...element, extend };
         };
         var checkIfSugar = (element, parent, key) => {
-          const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+          var _a;
+          const {
+            extend,
+            props,
+            childExtend,
+            extends: extendProps,
+            childExtends,
+            childProps,
+            children,
+            on,
+            $collection,
+            $stateCollection,
+            $propsCollection
+          } = element;
           const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-          return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+          if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+            const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+            if (logErr)
+              logErr.call(element, "Sugar component includes params for builtin components", { verbose: true });
+          }
+          return !hasComponentAttrs || childProps || extendProps || children || childExtends;
         };
         var extendizeByKey = (element, parent, key) => {
           const { context } = parent;
-          const { tag, extend, childrenExtends } = element;
-          const isSugar = checkIfSugar(element);
+          const { tag, extend, childExtends } = element;
+          const isSugar = checkIfSugar(element, parent, key);
           const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
           const isExtendKeyComponent = context && context.components[extendFromKey];
           if (element === isExtendKeyComponent)
             return element;
           else if (isSugar) {
-            const newElem = {
+            const newElem = addAdditionalExtend(element.extends, {
               extend: extendFromKey,
               tag,
               props: { ...element }
-            };
-            if (childrenExtends)
-              newElem.childExtend = childrenExtends;
+            });
+            if (childExtends)
+              newElem.childExtend = childExtends;
             return newElem;
           } else if (!extend || extend === true) {
             return {
@@ -3506,23 +3675,24 @@ var require_cjs2 = __commonJS({
             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)
+              assignChild(null);
+            else if (!childElem)
+              assignChild((0, import__.deepCloneWithExtend)(newChild));
             else {
-              const isSugar = checkIfSugar(childElem);
-              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
+              });
             }
           }
         };
@@ -4114,7 +4284,7 @@ var CONFIG = {
   useVariable: true,
   useReset: true,
   CSS_VARS,
-  ...defaultConfig_exports
+  ...void 0 || defaultConfig_exports
 };
 var cachedConfig = (0, import_utils.deepClone)(CONFIG);
 var FACTORY = {