@arbidocs/react 0.5.109 → 0.5.110

package/dist/index.d.cts

@@ -15529,6 +15529,7 @@ interface UploadFilesInput {
 interface UploadFilesProgress {
     loaded: number;
     total: number;
+    /** Share of the files sent (one on the wire counts by its bytes sent); it never goes back. */
     percentage: number;
     /** Batches done of all, when there is more than one. */
     batches: {

package/dist/index.d.ts

@@ -15529,6 +15529,7 @@ interface UploadFilesInput {
 interface UploadFilesProgress {
     loaded: number;
     total: number;
+    /** Share of the files sent (one on the wire counts by its bytes sent); it never goes back. */
     percentage: number;
     /** Batches done of all, when there is more than one. */
     batches: {

package/dist/index.js

@@ -3339,13 +3339,18 @@ function useUploadFiles() {
       }
       const total = input.files.reduce((sum, file) => sum + file.size, 0);
       const loadedByBatch = new Array(batches.length).fill(0);
+      const filesByBatch = new Array(batches.length).fill(0);
       let done = 0;
+      let highest = 0;
       const report = () => {
         const loaded = loadedByBatch.reduce((sum, bytes) => sum + bytes, 0);
+        const sent = filesByBatch.reduce((sum, files) => sum + files, 0);
+        const share = input.files.length > 0 ? sent / input.files.length : 0;
+        highest = Math.max(highest, Math.min(Math.round(share * 100), 100));
         onProgress?.({
           loaded,
           total,
-          percentage: total > 0 ? Math.min(Math.round(loaded / total * 100), 100) : 0,
+          percentage: highest,
           batches: batches.length > 1 ? { current: done, total: batches.length } : null
         });
       };
@@ -3359,11 +3364,14 @@ function useUploadFiles() {
             configExtId: input.configExtId ?? void 0,
             // Named even when it is the open one: batches sent after a switch stay in this workspace.
             workspaceExtId: workspaceId,
+            // One request for the batch: its files count by the share of its bytes sent.
             onProgress: (loaded) => {
               loadedByBatch[index] = Math.min(loaded, bytes);
+              filesByBatch[index] = bytes > 0 ? loadedByBatch[index] / bytes * files.length : 0;
               report();
             }
           });
+          const fileShares = new Array(files.length).fill(0);
           const directly = async (key, workspace) => arbi.documents.uploadDirect(
             workspace,
             key,
@@ -3378,9 +3386,15 @@ function useUploadFiles() {
               shared: input.shared,
               folder: folder ?? void 0,
               configExtId: input.configExtId ?? void 0,
-              // Ciphertext bytes, scaled back to the files' own so the total stays true.
-              onBytesProgress: ({ loaded, total: sent }) => {
-                loadedByBatch[index] = sent > 0 ? Math.round(loaded / sent * bytes) : 0;
+              // Per file, in ciphertext bytes: that file's share sent, scaled back to its own
+              // size so the byte total stays true.
+              onBytesProgress: ({ fileIndex, loaded, total: sent }) => {
+                const share = sent > 0 ? Math.min(loaded / sent, 1) : 0;
+                fileShares[fileIndex] = Math.max(fileShares[fileIndex] ?? 0, share);
+                loadedByBatch[index] = Math.round(
+                  files.reduce((sum, file, i) => sum + (fileShares[i] ?? 0) * file.size, 0)
+                );
+                filesByBatch[index] = fileShares.reduce((sum, part) => sum + part, 0);
                 report();
               }
             }
@@ -3397,6 +3411,7 @@ function useUploadFiles() {
             );
           }
           loadedByBatch[index] = bytes;
+          filesByBatch[index] = files.length;
           done += 1;
           report();
           return result;