Merge pull request #14115 from primefaces/issue-14046

Fixed #14046 - Fileupload | Unexpected disable behavior fix
primefaces · Nov 17, 2023 · 666212c · 666212c · vercel · Nov 17, 2023
2 parents 0057be7 + 1993faa
commit 666212c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/app/components/fileupload/fileupload.ts b/src/app/components/fileupload/fileupload.ts
@@ -743,15 +743,22 @@ export class FileUpload implements AfterViewInit, AfterContentInit, OnInit, OnDe
     }
 
     isFileLimitExceeded() {
-        if (this.fileLimit && this.fileLimit <= this.files.length + this.uploadedFileCount && this.focus) {
+        const isAutoMode = this.auto;
+        const totalFileCount = isAutoMode ? this.files.length : this.files.length + this.uploadedFileCount;
+
+        if (this.fileLimit && this.fileLimit <= totalFileCount && this.focus) {
             this.focus = false;
         }
 
-        return this.fileLimit && this.fileLimit < this.files.length + this.uploadedFileCount;
+        return this.fileLimit && this.fileLimit < totalFileCount;
     }
 
     isChooseDisabled() {
-        return this.fileLimit && this.fileLimit <= this.files.length + this.uploadedFileCount;
+        if (this.auto) {
+            return this.fileLimit && this.fileLimit <= this.files.length;
+        } else {
+            return this.fileLimit && this.fileLimit <= this.files.length + this.uploadedFileCount;
+        }
     }
 
     checkFileLimit() {