@putkoff/abstract-securefiles 0.0.47 → 0.0.48

package/dist/index.js

@@ -844,12 +844,45 @@ function FileTable({ files, loading, error, onToggleShare, onPatchShare, onDelet
                 } })] }));
 }
 
+// ── helpers ─────────────────────────────────────────────────────────────────
+/** Strip filename from a webkitRelativePath, keep the trailing slash. */
+function deriveRelPath(f) {
+    const wrp = f.webkitRelativePath;
+    if (!wrp)
+        return '';
+    const idx = wrp.lastIndexOf('/');
+    return idx >= 0 ? wrp.slice(0, idx + 1) : '';
+}
+/**
+ * Drain a DirectoryReader completely. The browser only returns ~100 entries
+ * per readEntries() call; you must call it repeatedly until it returns [].
+ */
+function readAllEntries(reader) {
+    return new Promise((resolve, reject) => {
+        const all = [];
+        const pump = () => {
+            reader.readEntries((batch) => {
+                if (batch.length === 0)
+                    resolve(all);
+                else {
+                    all.push(...batch);
+                    pump();
+                }
+            }, reject);
+        };
+        pump();
+    });
+}
+// ── component ───────────────────────────────────────────────────────────────
 function Upload({ onUploaded }) {
     const [queue, setQueue] = useState([]);
     const [busy, setBusy] = useState(false);
     const [message, setMessage] = useState(null);
     const [drag, setDrag] = useState(false);
-    const inputRef = useRef(null);
+    // Two refs: one for plain file picking, one for folder picking.
+    const fileInputRef = useRef(null);
+    const dirInputRef = useRef(null);
+    const [pickMode, setPickMode] = useState('files');
     const [dirs, setDirs] = useState([]);
     // — existing files → directory list —
     const { files, load } = useFiles();
@@ -869,56 +902,76 @@ function Upload({ onUploaded }) {
     const [creatingNew, setCreatingNew] = useState(false);
     const [newDirName, setNewDirName] = useState('');
     // — queue logic —
-    const enqueue = useCallback((files) => {
+    const enqueue = useCallback((incoming) => {
         setQueue(prev => {
             const map = new Map(prev.map(q => [`${q.file.name}-${q.file.size}`, q]));
-            files.forEach(q => map.set(`${q.file.name}-${q.file.size}`, q));
+            incoming.forEach(q => map.set(`${q.file.name}-${q.file.size}`, q));
             return Array.from(map.values());
         });
     }, []);
     const extractFromDataTransfer = useCallback(async (dt) => {
+        const items = Array.from(dt.items ?? []);
+        const hasEntryApi = items.length > 0 &&
+            typeof items[0].webkitGetAsEntry === 'function';
+        // Fallback: no entry API → flat files only, no folder traversal.
+        if (!hasEntryApi) {
+            return Array.from(dt.files ?? []).map(file => ({
+                file,
+                relPath: '',
+                progress: 0,
+            }));
+        }
         const out = [];
-        const walk = async (entry, path = "") => {
+        const walk = async (entry, path = '') => {
             if (!entry)
                 return;
             if (entry.isFile) {
-                const file = await new Promise(res => entry.file(res));
+                const file = await new Promise((res, rej) => entry.file(res, rej));
                 out.push({ file, relPath: path, progress: 0 });
+                return;
             }
-            else if (entry.isDirectory) {
+            if (entry.isDirectory) {
                 const reader = entry.createReader();
-                const entries = await new Promise(r => reader.readEntries(r));
+                const entries = await readAllEntries(reader);
                 await Promise.all(entries.map(e => walk(e, `${path}${entry.name}/`)));
             }
         };
-        await Promise.all(Array.from(dt.items).map(i => walk(i.webkitGetAsEntry())));
+        await Promise.all(items.map(i => walk(i.webkitGetAsEntry?.())));
         return out;
     }, []);
     const handleSelect = (e) => {
-        const files = Array.from(e.target.files || []);
-        const queued = files.map(f => ({
+        const picked = Array.from(e.target.files ?? []);
+        const queued = picked.map(f => ({
             file: f,
-            relPath: f.webkitRelativePath.replace(/[^/]*$/, ""),
+            relPath: deriveRelPath(f),
             progress: 0,
         }));
         enqueue(queued);
-        e.target.value = "";
+        e.target.value = '';
     };
     const handleDrop = async (e) => {
         e.preventDefault();
-        const files = await extractFromDataTransfer(e.dataTransfer);
-        enqueue(files.length ? files : []);
+        e.stopPropagation();
+        const dropped = await extractFromDataTransfer(e.dataTransfer);
+        if (dropped.length)
+            enqueue(dropped);
         setDrag(false);
     };
+    const openPicker = (e) => {
+        // Only fire when the dropzone background itself is clicked, not children.
+        if (e.target !== e.currentTarget && !e.target.closest('[data-dz-passthrough]')) ;
+        const ref = pickMode === 'folder' ? dirInputRef : fileInputRef;
+        ref.current?.click();
+    };
     const handleUploadAll = async () => {
         if (!queue.length) {
-            setMessage("No files queued.");
+            setMessage('No files queued.');
             return;
         }
         setBusy(true);
         setMessage(null);
         const targetDir = creatingNew
-            ? (newDirName.trim().replace(/^\/+|\/+$/g, "") + "/")
+            ? (newDirName.trim().replace(/^\/+|\/+$/g, '') + '/')
             : uploadDir;
         try {
             for (const { file, relPath } of queue) {
@@ -926,12 +979,12 @@ function Upload({ onUploaded }) {
                 setQueue(cur => cur.map(item => item.file === file ? { ...item, progress: 100 } : item));
             }
             setQueue([]);
-            await onUploaded();
-            setMessage("Upload complete");
-            load();
+            await onUploaded(); // SecureFiles passes filesHook.load here
+            setMessage('Upload complete');
+            // (removed the duplicate load() — onUploaded already does it)
         }
         catch {
-            setMessage("Upload failed");
+            setMessage('Upload failed');
         }
         finally {
             setBusy(false);
@@ -940,9 +993,9 @@ function Upload({ onUploaded }) {
     // — directory selector handlers —
     const handleDirChange = (e) => {
         const v = e.target.value;
-        if (v === "__new__") {
+        if (v === '__new__') {
             setCreatingNew(true);
-            setNewDirName("");
+            setNewDirName('');
         }
         else {
             setCreatingNew(false);
@@ -950,22 +1003,19 @@ function Upload({ onUploaded }) {
         }
     };
     const acceptNewDir = () => {
-        // normalize like before
         const cleanName = newDirName.trim().replace(/^\/+|\/+$/g, '');
+        if (!cleanName) {
+            setCreatingNew(false);
+            return;
+        }
         const normalized = `${uploadDir}${cleanName}/`;
-        // ① add it to our dirs list if it isn't there already
-        setDirs(prev => {
-            if (prev.includes(normalized))
-                return prev;
-            return [...prev, normalized].sort();
-        });
-        // ② select it & flip back to the <select>
+        setDirs(prev => prev.includes(normalized) ? prev : [...prev, normalized].sort());
         setUploadDir(normalized);
         setCreatingNew(false);
         setNewDirName('');
     };
-    return (jsxs("div", { className: "form-container max-w-2xl mx-auto", children: [jsxs("div", { className: `flex items-center border-2 border-dashed rounded-lg p-6 bg-white shadow-md space-x-4 transition-shadow duration-150
-          ${drag ? 'border-indigo-500 bg-indigo-50 shadow-lg' : 'border-gray-300 hover:shadow-lg'}`, onClick: () => inputRef.current?.click(), onDragEnter: e => { e.preventDefault(); setDrag(true); }, onDragOver: e => e.preventDefault(), onDragLeave: () => setDrag(false), onDrop: handleDrop, role: "region", "aria-label": "File upload area", children: [jsx(ForwardRef, { style: { width: 300, height: 300 }, className: "text-gray-500 mb-3", "aria-hidden": "true" }), jsxs("div", { className: "flex-1", children: [jsx("p", { className: "text-base font-semibold text-gray-700", children: "Drag & drop files or folders here" }), queue.length > 0 && (jsxs("p", { className: "mt-1 text-sm text-gray-600", children: [queue.length, " item", queue.length > 1 && 's', " queued"] }))] })] }), jsx("input", { ref: inputRef, type: "file", multiple: true, className: "hidden", ...{ webkitdirectory: true, directory: '' }, onChange: handleSelect }), jsxs("div", { className: "flex items-center justify-between mt-4", children: [jsx("div", { className: "flex-1 mr-4", children: !creatingNew ? (jsxs("select", { value: uploadDir, onChange: handleDirChange, className: "form-select w-full", children: [dirs.map(d => (jsx("option", { value: d, children: d }, d))), jsx("option", { value: "__new__", children: "+ Create new directory\u2026" })] })) : (jsxs("div", { className: "flex", children: [jsx("input", { type: "text", value: newDirName, placeholder: "new-folder-name", onChange: e => setNewDirName(e.target.value), onBlur: acceptNewDir, onKeyDown: e => e.key === 'Enter' && acceptNewDir(), className: "form-input flex-1" }), jsx(Button, { onClick: acceptNewDir, className: "ml-2", children: "OK" })] })) }), jsx(Button, { color: "blue", variant: "primary", onClick: handleUploadAll, disabled: busy || !queue.length, children: busy ? 'Uploading…' : `Upload ${queue.length}` })] }), message && (jsx("p", { className: `text-center text-sm ${message.includes('failed') ? 'text-red-600' : 'text-gray-600'}`, role: "alert", children: message })), queue.length > 0 && (jsxs("div", { className: "wm-container mt-4", children: [jsx("h3", { className: "mb-2 text-sm font-semibold text-gray-700", children: "Queued Files" }), jsx("ul", { className: "max-h-64 space-y-4 overflow-y-auto", children: queue.map(({ file, relPath, progress }) => (jsxs("li", { className: "space-y-1", children: [jsxs("div", { className: "flex justify-between items-center", children: [jsxs("span", { className: "truncate text-sm text-gray-800", children: [relPath, file.name] }), jsxs("span", { className: "text-xs text-gray-500", children: [progress, "%"] })] }), jsx("div", { className: "w-full bg-gray-200 rounded-full h-2 overflow-hidden", children: jsx("div", { className: "bg-indigo-600 h-2", style: { width: `${progress}%` } }) })] }, `${file.name}-${file.size}`))) })] }))] }));
+    return (jsxs("div", { className: "form-container max-w-2xl mx-auto", children: [jsxs("div", { className: "flex gap-4 text-xs text-gray-700 mb-1", children: [jsxs("label", { className: "flex items-center gap-1", children: [jsx("input", { type: "radio", name: "pick-mode", checked: pickMode === 'files', onChange: () => setPickMode('files') }), "Files"] }), jsxs("label", { className: "flex items-center gap-1", children: [jsx("input", { type: "radio", name: "pick-mode", checked: pickMode === 'folder', onChange: () => setPickMode('folder') }), "Folder"] }), jsx("span", { className: "text-gray-400", children: "(drag-and-drop accepts either)" })] }), jsxs("div", { className: `flex items-center border-2 border-dashed rounded-lg p-6 bg-white shadow-md space-x-4 transition-shadow duration-150
+          ${drag ? 'border-indigo-500 bg-indigo-50 shadow-lg' : 'border-gray-300 hover:shadow-lg'}`, onClick: openPicker, onDragEnter: e => { e.preventDefault(); e.stopPropagation(); setDrag(true); }, onDragOver: e => { e.preventDefault(); e.stopPropagation(); }, onDragLeave: e => { e.preventDefault(); e.stopPropagation(); setDrag(false); }, onDrop: handleDrop, role: "region", "aria-label": "File upload area", children: [jsx(ForwardRef, { style: { width: 300, height: 300 }, className: "text-gray-500 mb-3", "aria-hidden": "true" }), jsxs("div", { className: "flex-1", children: [jsx("p", { className: "text-base font-semibold text-gray-700", children: "Drag & drop files or folders here" }), jsxs("p", { className: "text-xs text-gray-500 mt-1", children: ["Click to ", pickMode === 'folder' ? 'choose a folder' : 'choose files'] }), queue.length > 0 && (jsxs("p", { className: "mt-1 text-sm text-gray-600", children: [queue.length, " item", queue.length > 1 && 's', " queued"] }))] })] }), jsx("input", { ref: fileInputRef, type: "file", multiple: true, className: "hidden", onChange: handleSelect }), jsx("input", { ref: dirInputRef, type: "file", multiple: true, className: "hidden", ...{ webkitdirectory: '', directory: '' }, onChange: handleSelect }), jsxs("div", { className: "flex items-center justify-between mt-4", children: [jsx("div", { className: "flex-1 mr-4", children: !creatingNew ? (jsxs("select", { value: uploadDir, onChange: handleDirChange, className: "form-select w-full", children: [dirs.map(d => (jsx("option", { value: d, children: d }, d))), jsx("option", { value: "__new__", children: "+ Create new directory\u2026" })] })) : (jsxs("div", { className: "flex", children: [jsx("input", { type: "text", value: newDirName, placeholder: "new-folder-name", onChange: e => setNewDirName(e.target.value), onBlur: acceptNewDir, onKeyDown: e => e.key === 'Enter' && acceptNewDir(), className: "form-input flex-1" }), jsx(Button, { onClick: acceptNewDir, className: "ml-2", children: "OK" })] })) }), jsx(Button, { color: "blue", variant: "primary", onClick: handleUploadAll, disabled: busy || !queue.length, children: busy ? 'Uploading…' : `Upload ${queue.length}` })] }), message && (jsx("p", { className: `text-center text-sm ${message.includes('failed') ? 'text-red-600' : 'text-gray-600'}`, role: "alert", children: message })), queue.length > 0 && (jsxs("div", { className: "wm-container mt-4", children: [jsx("h3", { className: "mb-2 text-sm font-semibold text-gray-700", children: "Queued Files" }), jsx("ul", { className: "max-h-64 space-y-4 overflow-y-auto", children: queue.map(({ file, relPath, progress }) => (jsxs("li", { className: "space-y-1", children: [jsxs("div", { className: "flex justify-between items-center", children: [jsxs("span", { className: "truncate text-sm text-gray-800", children: [relPath, file.name] }), jsxs("span", { className: "text-xs text-gray-500", children: [progress, "%"] })] }), jsx("div", { className: "w-full bg-gray-200 rounded-full h-2 overflow-hidden", children: jsx("div", { className: "bg-indigo-600 h-2", style: { width: `${progress}%` } }) })] }, `${file.name}-${file.size}`))) })] }))] }));
 }
 
 const SecureFiles = () => {