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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.201",
+  "version": "3.0.0-canary.203",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -50,9 +50,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/editor": "^3.0.0-canary.201",
-    "@firecms/formex": "^3.0.0-canary.201",
-    "@firecms/ui": "^3.0.0-canary.201",
+    "@firecms/editor": "^3.0.0-canary.203",
+    "@firecms/formex": "^3.0.0-canary.203",
+    "@firecms/ui": "^3.0.0-canary.203",
     "@hello-pangea/dnd": "^17.0.0",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
@@ -104,7 +104,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "39d8cd5c2397a004c233c96a798e16133ec8590c",
+  "gitHead": "bad3e5f8069d21897795c6d5c42f843e9967b66d",
   "publishConfig": {
     "access": "public"
   },

package/src/components/ArrayContainer.tsx

@@ -289,7 +289,7 @@ export function ArrayContainerItem({
         ref={provided.innerRef}
         {...provided.draggableProps}
         style={provided.draggableProps.style}
-        className={`${
+        className={`relative ${
             !isDragging ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 dark:hover:bg-opacity-20" : ""
         } rounded-md opacity-100`}
     >

package/src/form/EntityForm.tsx

@@ -81,6 +81,8 @@ export type EntityFormProps<M extends Record<string, any>> = {
     showEntityPath?: boolean;
 
     EntityFormActionsComponent?: React.FC<EntityFormActionsProps>;
+
+    children?: React.ReactNode;
 };
 
 export function EntityForm<M extends Record<string, any>>({
@@ -102,7 +104,8 @@ export function EntityForm<M extends Record<string, any>>({
                                                               formex: formexProp,
                                                               EntityFormActionsComponent = EntityFormActions,
                                                               showDefaultActions = true,
-                                                              showEntityPath = true
+                                                              showEntityPath = true,
+                                                              children
                                                           }: EntityFormProps<M>) {
 
     if (collection.customId && collection.formAutoSave) {
@@ -571,7 +574,7 @@ export function EntityForm<M extends Record<string, any>>({
 
     const formView = <ErrorBoundary>
         <>
-            <div className={"w-full py-2 flex flex-col items-start mt-4 lg:mt-8 mb-8"}>
+            <div className={"w-full py-2 flex flex-col items-start my-4 lg:my-6"}>
                 <Typography
                     className={"py-4 flex-grow line-clamp-1 " + (collection.hideIdFromForm ? "mb-2" : "mb-0")}
                     variant={"h4"}>
@@ -585,6 +588,8 @@ export function EntityForm<M extends Record<string, any>>({
                 </Alert>}
             </div>
 
+            {children}
+
             {!collection.hideIdFromForm &&
                 <CustomIdField customId={collection.customId}
                                entityId={entityId}
@@ -643,7 +648,8 @@ function getInitialEntityValues<M extends object>(
         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);

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -75,7 +75,7 @@ export function MapFieldBinding({
                             };
 
                             return (
-                                <div key={`map-${propertyKey}-${index}`}>
+                                <div key={`map-${propertyKey}-${index}`} className={"relative"}>
                                     <ErrorBoundary>
                                         <PropertyFieldBinding
                                             {...fieldBindingProps}/>

package/src/util/objects.ts

@@ -18,7 +18,10 @@ export function mergeDeep<T extends Record<any, any>, U extends Record<any, any>
     if (targetIsObject && isObject(source)) {
         Object.keys(source).forEach(key => {
             const sourceElement = source[key];
-            if (isObject(sourceElement)) {
+            if (sourceElement instanceof Date) {
+                // Assign a new Date instance with the same time value
+                Object.assign(output, { [key]: new Date(sourceElement.getTime()) });
+            } else if (isObject(sourceElement)) {
                 if (!(key in target))
                     Object.assign(output, { [key]: sourceElement });
                 else