Fix progress meter

regalijan · Mar 27, 2024 · cbfa13e · cbfa13e
1 parent f8e19b8
commit cbfa13e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/routes/report.tsx b/app/routes/report.tsx
@@ -184,8 +184,9 @@ export default function () {
         xhr.upload.onprogress = (e) => {
           if (!e.lengthComputable) return;
 
-          bytesRead += e.loaded;
-          setFileProgress(Math.floor((bytesRead / totalSize) * 100));
+          setFileProgress(
+            Math.floor(((bytesRead + e.loaded) / totalSize) * 100),
+          );
         };
         xhr.upload.onabort = () => {
           shouldRecall = true;
@@ -197,9 +198,11 @@ export default function () {
           setUploading(false);
           setFileProgress(0);
         };
-        xhr.upload.onloadend = () => {
+        xhr.upload.onloadend = (ev) => {
           if (i === upload_urls.length - 1) setUploading(false);
 
+          bytesRead += ev.total;
+          setFileProgress(bytesRead);
           resolve(null);
         };