@firecms/core 3.1.0-canary.24c8270 → 3.1.0-canary.501d471

package/src/util/index.ts

@@ -25,3 +25,4 @@ export * from "./useTraceUpdate";
 export * from "./storage";
 export * from "./callbacks";
 export * from "./conditions";
+export * from "./lazy_eager";

package/src/util/lazy_eager.tsx

@@ -0,0 +1,33 @@
+import React from "react";
+
+/**
+ * Returns a React.lazy component that is also preloaded immediately using
+ * requestIdleCallback or setTimeout.
+ * This ensures that chunks are split, but fetched in the background before they are actually needed.
+ */
+export function lazyEager<T extends React.ComponentType<any>>(
+    factory: () => Promise<any>,
+    exportName: string = "default"
+): React.LazyExoticComponent<T> {
+    let promise: Promise<any> | null = null;
+
+    const load = () => {
+        if (!promise) {
+            promise = factory().then((module) => {
+                const component = module[exportName] || module.default || module;
+                return { default: component };
+            });
+        }
+        return promise;
+    };
+
+    if (typeof window !== "undefined") {
+        if ("requestIdleCallback" in window) {
+            (window as any).requestIdleCallback(load);
+        } else {
+            setTimeout(load, 500);
+        }
+    }
+
+    return React.lazy(load);
+}

package/src/util/objects.ts

@@ -279,3 +279,18 @@ export function removePropsIfExisting(source: any, comparison: any) {
 
     return res;
 }
+
+export function jsonStringifyReplacer(key: string, value: any) {
+    if (value && typeof value === "object") {
+        if (value instanceof Date) {
+            return value.toISOString();
+        }
+        if ("_seconds" in value && "_nanoseconds" in value && typeof value._seconds === "number" && typeof value._nanoseconds === "number") {
+            return new Date(value._seconds * 1000 + value._nanoseconds / 1000000).toISOString();
+        }
+        if ("seconds" in value && "nanoseconds" in value && typeof value.seconds === "number" && typeof value.nanoseconds === "number") {
+            return new Date(value.seconds * 1000 + value.nanoseconds / 1000000).toISOString();
+        }
+    }
+    return value;
+}

package/src/util/useStorageUploadController.tsx

@@ -207,43 +207,37 @@ export function useStorageUploadController<M extends object>({
                 console.error("Error processing file with custom code. Attempting to continue uploading.", e);
             }
         }
+        let newInternalValue: StorageFieldItem[] = [...internalValue];
 
-        let newInternalValue: StorageFieldItem[];
-
-        if (multipleFilesSupported) {
-            newInternalValue = [...internalValue,
-                ...(await Promise.all(acceptedFiles.map(async file => {
-                    if ((imageResize || legacyCompression) && isImageFile(file)) {
-                        file = await resizeImage(file, imageResize, legacyCompression);
-                    }
-
-                    return {
-                        id: getRandomId(),
-                        file,
-                        fileName: await fileNameBuilder(file),
-                        metadata,
-                        size
-                    } as StorageFieldItem;
-                })))];
-        } else {
-            let file = acceptedFiles[0];
+        for (let file of acceptedFiles) {
             if ((imageResize || legacyCompression) && isImageFile(file)) {
                 file = await resizeImage(file, imageResize, legacyCompression);
             }
 
-            newInternalValue = [{
-                id: getRandomId(),
-                file,
-                fileName: await fileNameBuilder(file),
-                metadata,
-                size
-            }];
+            if (multipleFilesSupported) {
+                newInternalValue.push({
+                    id: getRandomId(),
+                    file,
+                    fileName: await fileNameBuilder(file),
+                    metadata,
+                    size
+                } as StorageFieldItem);
+            } else {
+                newInternalValue = [{
+                    id: getRandomId(),
+                    file,
+                    fileName: await fileNameBuilder(file),
+                    metadata,
+                    size
+                }];
+                break; // Only keep the first file
+            }
         }
 
         // Remove either storage path or file duplicates
         newInternalValue = removeDuplicates(newInternalValue);
         setInternalValue(newInternalValue);
-    }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size, imageResize, legacyCompression]);
+    }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size, imageResize, legacyCompression, processFile]);
 
     return {
         internalValue,
@@ -300,7 +294,7 @@ function getRandomId() {
 /**
  * Check if a file is an image type supported for resizing
  */
-function isImageFile(file: File): boolean {
+export function isImageFile(file: File): boolean {
     return file.type === "image/jpeg" ||
         file.type === "image/png" ||
         file.type === "image/webp";
@@ -310,7 +304,7 @@ function isImageFile(file: File): boolean {
  * Resize and compress an image using compressorjs.
  * Supports both the new imageResize API and legacy imageCompression for backward compatibility.
  */
-async function resizeImage(
+export async function resizeImage(
     file: File,
     imageResize?: StorageConfig["imageResize"],
     legacyCompression?: ImageResize