@hexure/ui 1.14.8 → 1.14.9

package/dist/cjs/index.js

@@ -4507,31 +4507,45 @@ const FileUpload = ({ accept, onChange, disabled = false, onError, maxFiles = 10
     const addFiles = (addedFiles) => {
         const newFiles = [];
         const errors = [];
-        addedFiles.forEach(file => {
+        for (const file of addedFiles) {
             let valid = true;
-            if (accept) {
-                if (!accept.includes(file.type)) {
-                    valid = false;
-                    errors.push({
-                        file,
-                        message: 'File type is not permitted.',
-                    });
-                }
+            // Validate max files count - check if we've already reached the limit
+            const currentTotalFiles = files.length + newFiles.length;
+            if (currentTotalFiles >= maxFiles) {
+                errors.push({
+                    file,
+                    message: 'Maximum number of files reached.',
+                });
+                break;
             }
-            if (file.size > maxSize * 1000000 || files.length + newFiles.length === maxFiles) {
+            // Validate file type
+            if (valid && accept && !accept.includes(file.type)) {
+                errors.push({
+                    file,
+                    message: 'File type is not permitted.',
+                });
                 valid = false;
+            }
+            // Validate file size
+            if (valid && file.size > maxSize * 1000000) {
                 errors.push({
                     file,
                     message: 'File size exceeds limit.',
                 });
+                valid = false;
             }
-            if (validateFile && !validateFile(file)) {
+            // Custom validation
+            if (valid && validateFile && !validateFile(file)) {
+                errors.push({
+                    file,
+                    message: 'Custom validation failed.',
+                });
                 valid = false;
             }
             if (valid) {
                 newFiles.push(file);
             }
-        });
+        }
         if (errors.length && onError) {
             onError(errors);
         }