@firecms/core 3.0.0-canary.244 → 3.0.0-canary.246

package/dist/index.es.js

@@ -251,31 +251,36 @@ function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
 function mergeDeep(target, source, ignoreUndefined = false) {
-  const targetIsObject = isObject(target);
-  const output = targetIsObject ? {
+  if (!isObject(target)) {
+    return target;
+  }
+  const output = {
     ...target
-  } : target;
-  if (targetIsObject && isObject(source)) {
-    Object.keys(source).forEach((key) => {
-      const sourceElement = source[key];
-      if (ignoreUndefined && sourceElement === void 0) {
-        return;
+  };
+  if (!isObject(source)) {
+    return output;
+  }
+  for (const key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      const sourceValue = source[key];
+      const outputValue = output[key];
+      if (ignoreUndefined && sourceValue === void 0) {
+        continue;
       }
-      if (sourceElement instanceof Date) {
-        Object.assign(output, {
-          [key]: new Date(sourceElement.getTime())
-        });
-      } else if (isObject(sourceElement)) {
-        if (!(key in target)) Object.assign(output, {
-          [key]: sourceElement
-        });
-        else output[key] = mergeDeep(target[key], sourceElement);
+      if (sourceValue instanceof Date) {
+        output[key] = new Date(sourceValue.getTime());
+      } else if (Array.isArray(sourceValue)) {
+        output[key] = [...sourceValue];
+      } else if (isObject(sourceValue)) {
+        if (isObject(outputValue)) {
+          output[key] = mergeDeep(outputValue, sourceValue, ignoreUndefined);
+        } else {
+          output[key] = sourceValue;
+        }
       } else {
-        Object.assign(output, {
-          [key]: sourceElement
-        });
+        output[key] = sourceValue;
       }
-    });
+    }
   }
   return output;
 }
@@ -4406,11 +4411,6 @@ async function saveEntityWithCallbacks({
   } else {
     updatedValues = values;
   }
-  console.debug("Saving entity", {
-    entityId,
-    updatedValues,
-    collection
-  });
   return dataSource.saveEntity({
     collection,
     path: resolvedPath,
@@ -4445,7 +4445,6 @@ async function saveEntityWithCallbacks({
     }
     if (onSaveSuccess) onSaveSuccess(entity);
   }).catch((e) => {
-    console.error("!!!", e);
     if (callbacks?.onSaveFailure) {
       const resolvedCollection = resolveCollection({
         collection,
@@ -21885,7 +21884,8 @@ function EntityEditViewInner({
   };
   const entityReadOnlyView = !canEdit && entity ? /* @__PURE__ */ jsx("div", { className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", canEdit || !mainViewVisible || selectedSecondaryForm ? "hidden" : ""), children: /* @__PURE__ */ jsxs("div", { className: cls("relative flex flex-col max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit"), children: [
     /* @__PURE__ */ jsx(Typography, { className: "mt-16 mb-8 mx-8", variant: "h4", children: collection.singularName ?? collection.name }),
-    /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection })
+    /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
+    /* @__PURE__ */ jsx("div", { className: "h-16" })
   ] }) }) : null;
   const entityView = /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
     setUsedEntity(entity_0);