cloudmr-ux 1.6.7 → 1.6.9

package/dist/index.d.ts

@@ -274,7 +274,7 @@ interface UploadWindowProps {
     upload: (file: File, fileAlias: string, fileDatabase: string) => Promise<number>;
     open: boolean;
     setOpen: React.Dispatch<React.SetStateAction<boolean>>;
-    fileExtension?: string;
+    fileExtension?: string | string[];
     template?: {
         showFileName?: boolean;
         showDatabase?: boolean;

package/dist/index.js

@@ -317,6 +317,16 @@ function CmrUploadWindow({
   const handleClose = () => {
     setOpen(false);
   };
+  const checkExtension = (filename, allowed) => {
+    if (!filename)
+      return false;
+    const name = filename.toLowerCase();
+    if (Array.isArray(allowed)) {
+      return allowed.some((ext) => name.endsWith(ext.startsWith(".") ? ext : "." + ext));
+    } else {
+      return name.endsWith(allowed.startsWith(".") ? allowed : "." + allowed);
+    }
+  };
   const getExtension = (fileName) => {
     if (fileName == void 0)
       return;
@@ -464,8 +474,10 @@ function CmrUploadWindow({
         let draggedFiles = e.dataTransfer.files;
         if (draggedFiles.length > 1) {
           setUploadBoxWarning("Only one file can be uploaded at a time");
-        } else if (fileExtension != void 0 && draggedFiles.length != 0 && getExtension(draggedFiles[0].name) != fileExtension) {
-          setUploadBoxWarning(`Only accepting files with extension ${fileExtension}`);
+        } else if (fileExtension != void 0 && draggedFiles.length !== 0 && !checkExtension(draggedFiles[0].name, fileExtension)) {
+          setUploadBoxWarning(
+            `Only accepting files with extension(s): ${Array.isArray(fileExtension) ? fileExtension.join(", ") : fileExtension}`
+          );
         }
       }
       e.dataTransfer.dropEffect = "copy";
@@ -481,10 +493,12 @@ function CmrUploadWindow({
         setWarningText("Only one file can be uploaded at a time");
         setTimeout(() => setInfoOpen(false), 2500);
         return;
-      } else if (fileExtension != void 0 && `.${getExtension(files[0].name)}` != fileExtension) {
+      } else if (fileExtension !== void 0 && !checkExtension(files[0].name, fileExtension)) {
         setInfoOpen(true);
         setInfoStyle("warning");
-        setWarningText(`Only accepting files with extension ${fileExtension}`);
+        setWarningText(
+          `Only accepting files with extension(s): ${Array.isArray(fileExtension) ? fileExtension.join(", ") : fileExtension}`
+        );
         setTimeout(() => setInfoOpen(false), 2500);
         return;
       }
@@ -551,7 +565,7 @@ function CmrUploadWindow({
             type: "file",
             id: "file-window",
             multiple: true,
-            accept: fileExtension == void 0 ? "*" : fileExtension,
+            accept: fileExtension === void 0 ? "*" : Array.isArray(fileExtension) ? fileExtension.join(",") : fileExtension,
             style: { display: "none" },
             onChange: loadSelectedFiles
           }

package/dist/index.mjs

@@ -269,6 +269,16 @@ function CmrUploadWindow({
   const handleClose = () => {
     setOpen(false);
   };
+  const checkExtension = (filename, allowed) => {
+    if (!filename)
+      return false;
+    const name = filename.toLowerCase();
+    if (Array.isArray(allowed)) {
+      return allowed.some((ext) => name.endsWith(ext.startsWith(".") ? ext : "." + ext));
+    } else {
+      return name.endsWith(allowed.startsWith(".") ? allowed : "." + allowed);
+    }
+  };
   const getExtension = (fileName) => {
     if (fileName == void 0)
       return;
@@ -416,8 +426,10 @@ function CmrUploadWindow({
         let draggedFiles = e.dataTransfer.files;
         if (draggedFiles.length > 1) {
           setUploadBoxWarning("Only one file can be uploaded at a time");
-        } else if (fileExtension != void 0 && draggedFiles.length != 0 && getExtension(draggedFiles[0].name) != fileExtension) {
-          setUploadBoxWarning(`Only accepting files with extension ${fileExtension}`);
+        } else if (fileExtension != void 0 && draggedFiles.length !== 0 && !checkExtension(draggedFiles[0].name, fileExtension)) {
+          setUploadBoxWarning(
+            `Only accepting files with extension(s): ${Array.isArray(fileExtension) ? fileExtension.join(", ") : fileExtension}`
+          );
         }
       }
       e.dataTransfer.dropEffect = "copy";
@@ -433,10 +445,12 @@ function CmrUploadWindow({
         setWarningText("Only one file can be uploaded at a time");
         setTimeout(() => setInfoOpen(false), 2500);
         return;
-      } else if (fileExtension != void 0 && `.${getExtension(files[0].name)}` != fileExtension) {
+      } else if (fileExtension !== void 0 && !checkExtension(files[0].name, fileExtension)) {
         setInfoOpen(true);
         setInfoStyle("warning");
-        setWarningText(`Only accepting files with extension ${fileExtension}`);
+        setWarningText(
+          `Only accepting files with extension(s): ${Array.isArray(fileExtension) ? fileExtension.join(", ") : fileExtension}`
+        );
         setTimeout(() => setInfoOpen(false), 2500);
         return;
       }
@@ -503,7 +517,7 @@ function CmrUploadWindow({
             type: "file",
             id: "file-window",
             multiple: true,
-            accept: fileExtension == void 0 ? "*" : fileExtension,
+            accept: fileExtension === void 0 ? "*" : Array.isArray(fileExtension) ? fileExtension.join(",") : fileExtension,
             style: { display: "none" },
             onChange: loadSelectedFiles
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmr-ux",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",