@shipstatic/drop 2.10.4-beta.7 → 2.10.4-beta.8

package/dist/index.js

@@ -1119,13 +1119,12 @@ function useDrop({ ship }) {
     [state.files]
   );
   const getFilesForUpload = useCallback(() => validFiles.map((f) => f.file), [validFiles]);
-  const processFiles2 = useCallback(
-    async (newFiles) => {
+  const prepare = useCallback(
+    async (collect) => {
       if (runRef.current) {
         console.warn("File processing already in progress. Ignoring duplicate call.");
         return;
       }
-      if (!newFiles || newFiles.length === 0) return;
       const run = new AbortController();
       runRef.current = run;
       setState({
@@ -1134,8 +1133,17 @@ function useDrop({ ship }) {
         status: { title: "Processing...", details: "Validating and preparing files." }
       });
       try {
-        const outcome = await processFiles(newFiles, {
-          limits: await ship.getLimits({ signal: run.signal }),
+        const [files, limits] = await Promise.all([
+          collect(),
+          ship.getLimits({ signal: run.signal })
+        ]);
+        if (run.signal.aborted) return;
+        if (files.length === 0) {
+          setState(initialState);
+          return;
+        }
+        const outcome = await processFiles(files, {
+          limits,
           onStatus: (status) => {
             if (!run.signal.aborted) setState((prev) => ({ ...prev, status }));
           }
@@ -1165,6 +1173,13 @@ function useDrop({ ship }) {
     },
     [ship]
   );
+  const processFiles2 = useCallback(
+    async (newFiles) => {
+      if (!newFiles || newFiles.length === 0) return;
+      await prepare(async () => newFiles);
+    },
+    [prepare]
+  );
   const reset = useCallback(() => {
     runRef.current?.abort();
     runRef.current = null;
@@ -1203,13 +1218,14 @@ function useDrop({ ship }) {
           if (file) files.push(file);
         }
       }
-      await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
-      if (files.length === 0 && e.dataTransfer.files.length > 0) {
-        files.push(...Array.from(e.dataTransfer.files));
-      }
-      if (files.length > 0) await processFiles2(files);
+      const plain = Array.from(e.dataTransfer.files);
+      if (directories.length === 0 && files.length === 0 && plain.length === 0) return;
+      await prepare(async () => {
+        await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
+        return files.length > 0 ? files : plain;
+      });
     },
-    [processFiles2]
+    [prepare]
   );
   const handleInputChange = useCallback(
     (e) => {