@firecms/core 3.0.0-canary.201 → 3.0.0-canary.203

package/dist/form/EntityForm.d.ts

@@ -38,8 +38,9 @@ export type EntityFormProps<M extends Record<string, any>> = {
      */
     showEntityPath?: boolean;
     EntityFormActionsComponent?: React.FC<EntityFormActionsProps>;
+    children?: React.ReactNode;
 };
-export declare function EntityForm<M extends Record<string, any>>({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, EntityFormActionsComponent, showDefaultActions, showEntityPath }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
+export declare function EntityForm<M extends Record<string, any>>({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, EntityFormActionsComponent, showDefaultActions, showEntityPath, children }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
 export declare function yupToFormErrors(yupError: ValidationError): Record<string, any>;
 export declare function FormLayoutInner({ id, formContext, children, className, forceActionsAtTheBottom, pluginActions, EntityFormActionsComponent, showDefaultActions, }: {
     id?: string;

package/dist/index.es.js

@@ -212,7 +212,11 @@ function mergeDeep(target, source) {
   if (targetIsObject && isObject(source)) {
     Object.keys(source).forEach((key) => {
       const sourceElement = source[key];
-      if (isObject(sourceElement)) {
+      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
         });
@@ -15719,7 +15723,7 @@ function ArrayContainerItem(t0) {
   const t1 = provided.innerRef;
   const t2 = provided.draggableProps;
   const t3 = provided.draggableProps.style;
-  const t4 = `${!isDragging ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 dark:hover:bg-opacity-20" : ""} rounded-md opacity-100`;
+  const t4 = `relative ${!isDragging ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 dark:hover:bg-opacity-20" : ""} rounded-md opacity-100`;
   let t5;
   if ($[0] !== internalId || $[1] !== updateItemCustomProps) {
     t5 = (props) => updateItemCustomProps(internalId, props);
@@ -16294,7 +16298,8 @@ function EntityForm({
   formex: formexProp,
   EntityFormActionsComponent = EntityFormActions,
   showDefaultActions = true,
-  showEntityPath = true
+  showEntityPath = true,
+  children
 }) {
   if (collection.customId && collection.formAutoSave) {
     console.warn(`The collection ${collection.path} has customId and formAutoSave enabled. This is not supported and formAutoSave will be ignored`);
@@ -16646,7 +16651,7 @@ function EntityForm({
   }).filter(Boolean) });
   const formRef = useRef(null);
   const formView = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsxs("div", { className: "w-full py-2 flex flex-col items-start mt-4 lg:mt-8 mb-8", children: [
+    /* @__PURE__ */ jsxs("div", { className: "w-full py-2 flex flex-col items-start my-4 lg:my-6", children: [
       /* @__PURE__ */ jsx(Typography, { className: "py-4 flex-grow line-clamp-1 " + (collection.hideIdFromForm ? "mb-2" : "mb-0"), variant: "h4", children: title ?? collection.singularName ?? collection.name }),
       showEntityPath && /* @__PURE__ */ jsx(Alert, { color: "base", className: "w-full", size: "small", children: /* @__PURE__ */ jsxs("code", { className: "text-xs select-all text-text-secondary dark:text-text-secondary-dark", children: [
         entity?.path ?? path,
@@ -16654,6 +16659,7 @@ function EntityForm({
         entityId
       ] }) })
     ] }),
+    children,
     !collection.hideIdFromForm && /* @__PURE__ */ jsx(CustomIdField, { customId: collection.customId, entityId, status, onChange: setEntityId, error: entityIdError, loading: customIdLoading, entity }),
     entityId && formContext && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { className: "mt-12 flex flex-col gap-8", ref: formRef, children: [
       formFields(),
@@ -16678,7 +16684,8 @@ function getInitialEntityValues(collection, path, status, entity, propertyConfig
     if (!collection.alwaysApplyDefaultValues) {
       return entity.values ?? getDefaultValuesFor(properties);
     } else {
-      return mergeDeep(getDefaultValuesFor(properties), entity.values ?? {});
+      const defaultValues = getDefaultValuesFor(properties);
+      return mergeDeep(defaultValues, entity.values ?? {});
     }
   } else if (status === "new") {
     return getDefaultValuesFor(properties);
@@ -18798,7 +18805,7 @@ function MapFieldBinding(t0) {
             });
           }
         };
-        return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, { ...fieldBindingProps }) }) }, `map-${propertyKey}-${index}`);
+        return /* @__PURE__ */ jsx("div", { className: "relative", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, { ...fieldBindingProps }) }) }, `map-${propertyKey}-${index}`);
       };
       $[14] = autoFocus;
       $[15] = context;