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

package/dist/types/collections.d.ts

@@ -111,7 +111,8 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
     propertiesOrder?: (Extract<keyof M, string> | string | `subcollection:${string}` | "collectionGroupParent")[];
     /**
      * If enabled, content is loaded in batches. If `false` all entities in the
-     * collection are loaded.
+     * collection are loaded. This means that when reaching the end of the
+     * collection, the CMS will load more entities.
      * You can specify a number to specify the pagination size (50 by default)
      * Defaults to `true`
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.244",
+  "version": "3.0.0-canary.246",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -53,9 +53,9 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@firecms/editor": "^3.0.0-canary.244",
-    "@firecms/formex": "^3.0.0-canary.244",
-    "@firecms/ui": "^3.0.0-canary.244",
+    "@firecms/editor": "^3.0.0-canary.246",
+    "@firecms/formex": "^3.0.0-canary.246",
+    "@firecms/ui": "^3.0.0-canary.246",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
@@ -107,7 +107,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "6b3dcdc942e0fd64e3023b5361c34ec2ac2bb1d3",
+  "gitHead": "0ba87a9533643d2d58455e02e99b4cab92beaf64",
   "publishConfig": {
     "access": "public"
   },

package/src/core/EntityEditView.tsx

@@ -337,6 +337,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                 entity={entity}
                 path={path}
                 collection={collection}/>
+            <div className="h-16"/>
         </div>
     </div> : null;
 

package/src/hooks/data/save.ts

@@ -100,11 +100,6 @@ export async function saveEntityWithCallbacks<M extends Record<string, any>, USE
         updatedValues = values;
     }
 
-    console.debug("Saving entity", {
-        entityId,
-        updatedValues,
-        collection
-    });
     return dataSource.saveEntity({
         collection,
         path: resolvedPath,
@@ -142,7 +137,6 @@ export async function saveEntityWithCallbacks<M extends Record<string, any>, USE
             onSaveSuccess(entity);
     })
         .catch((e) => {
-            console.error("!!!", e);
             if (callbacks?.onSaveFailure) {
 
                 const resolvedCollection = resolveCollection<M>({

package/src/types/collections.ts

@@ -127,7 +127,8 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
 
     /**
      * If enabled, content is loaded in batches. If `false` all entities in the
-     * collection are loaded.
+     * collection are loaded. This means that when reaching the end of the
+     * collection, the CMS will load more entities.
      * You can specify a number to specify the pagination size (50 by default)
      * Defaults to `true`
      */

package/src/util/objects.ts

@@ -12,32 +12,65 @@ export function isObject(item: any) {
     return item && typeof item === "object" && !Array.isArray(item);
 }
 
-export function mergeDeep<T extends Record<any, any>, U extends Record<any, any>>(target: T, source: U, ignoreUndefined: boolean = false): T & U {
-    const targetIsObject = isObject(target);
-    const output = targetIsObject ? { ...target } : target;
-    if (targetIsObject && isObject(source)) {
-        Object.keys(source).forEach(key => {
-            const sourceElement = source[key];
-            // Skip undefined values when ignoreUndefined is true
-            if (ignoreUndefined && sourceElement === undefined) {
-                return;
+export function mergeDeep<T extends Record<any, any>, U extends Record<any, any>>(
+    target: T,
+    source: U,
+    ignoreUndefined: boolean = false
+): T & U {
+    // If target is not a true object (e.g., null, array, primitive), return target itself.
+    if (!isObject(target)) {
+        return target as T & U;
+    }
+
+    // Create a shallow copy of the target to avoid modifying the original object.
+    const output = { ...target };
+
+    // If source is not a true object, there's nothing to merge from it.
+    // Return the shallow copy of target.
+    if (!isObject(source)) {
+        return output as T & U;
+    }
+
+    // Iterate over keys in the source object.
+    for (const key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+            const sourceValue = source[key];
+            const outputValue = (output as any)[key]; // Current value in our merged object (originating from target)
+
+            // Skip if source value is undefined and ignoreUndefined is true.
+            // This handles both not adding new undefined properties and not overwriting existing properties with undefined.
+            if (ignoreUndefined && sourceValue === undefined) {
+                continue;
             }
-            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
-                    (output as any)[key] = mergeDeep((target as any)[key], sourceElement);
+
+            if ((sourceValue as any) instanceof Date) {
+                // If source value is a Date, create a new Date instance.
+                (output as any)[key] = new Date(sourceValue.getTime());
+            } else if (Array.isArray(sourceValue)) {
+                // If source value is an array, create a shallow copy of the array.
+                (output as any)[key] = [...sourceValue];
+            } else if (isObject(sourceValue)) {
+                // If source value is an object:
+                if (isObject(outputValue)) {
+                    // If the corresponding value in output (from target) is also an object, recurse.
+                    // Ensure the ignoreUndefined flag is passed down.
+                    (output as any)[key] = mergeDeep(outputValue, sourceValue, ignoreUndefined);
+                } else {
+                    // If output's value (from target) is not an object (e.g., null, primitive, or key didn't exist in original target),
+                    // overwrite with the source object.
+                    (output as any)[key] = sourceValue;
+                }
             } else {
-                Object.assign(output, { [key]: sourceElement });
+                // If source value is a primitive, null, or undefined (and not ignored).
+                (output as any)[key] = sourceValue;
             }
-        });
+        }
     }
-    return output as T;
+
+    return output as T & U;
 }
 
+
 export function getValueInPath(o: object | undefined, path: string): any {
     if (!o) return undefined;
     if (typeof o === "object") {