@firecms/core 3.0.0-canary.200 → 3.0.0-canary.202

package/dist/types/collections.d.ts

@@ -281,6 +281,12 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
      * This prop has only effect if you are using the collection editor.
      */
     editable?: boolean;
+    /**
+     * If set to true, the default values of the properties will be applied
+     * to the entity every time the entity is updated (not only when created).
+     * Defaults to false.
+     */
+    alwaysApplyDefaultValues?: boolean;
 }
 /**
  * Parameter passed to the `Actions` prop in the collection configuration.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.200",
+  "version": "3.0.0-canary.202",
   "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.200",
-    "@firecms/formex": "^3.0.0-canary.200",
-    "@firecms/ui": "^3.0.0-canary.200",
+    "@firecms/editor": "^3.0.0-canary.202",
+    "@firecms/formex": "^3.0.0-canary.202",
+    "@firecms/ui": "^3.0.0-canary.202",
     "@hello-pangea/dnd": "^17.0.0",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
@@ -104,7 +104,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "436e2b226039bdd2f3fe2f78a4e072200a715ddb",
+  "gitHead": "6e21f87de35d34c8c4fcb15d1e5f1d07b0f69488",
   "publishConfig": {
     "access": "public"
   },

package/src/form/EntityForm.tsx

@@ -6,7 +6,8 @@ import {
     EntityStatus,
     EntityValues,
     FormContext,
-    PluginFormActionProps, PropertyConfig,
+    PluginFormActionProps,
+    PropertyConfig,
     PropertyFieldBindingProps,
     ResolvedEntityCollection
 } from "../types";
@@ -19,6 +20,7 @@ import {
     getValueInPath,
     isHidden,
     isReadOnly,
+    mergeDeep,
     resolveCollection,
     useDebouncedCallback
 } from "../util";
@@ -638,7 +640,12 @@ function getInitialEntityValues<M extends object>(
     });
     const properties = resolvedCollection.properties;
     if ((status === "existing" || status === "copy") && entity) {
-        return entity.values ?? getDefaultValuesFor(properties);
+        if (!collection.alwaysApplyDefaultValues) {
+            return entity.values ?? getDefaultValuesFor(properties);
+        } else {
+            const defaultValues = getDefaultValuesFor(properties);
+            return mergeDeep(defaultValues, entity.values ?? {});
+        }
     } else if (status === "new") {
         return getDefaultValuesFor(properties);
     } else {

package/src/types/collections.ts

@@ -323,6 +323,13 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
      * This prop has only effect if you are using the collection editor.
      */
     editable?: boolean;
+
+    /**
+     * If set to true, the default values of the properties will be applied
+     * to the entity every time the entity is updated (not only when created).
+     * Defaults to false.
+     */
+    alwaysApplyDefaultValues?: boolean;
 }
 
 /**

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