From 02b44ed97bb37ecd5416e2782bf8e05a23fc725b Mon Sep 17 00:00:00 2001 From: Srikanth Adi Date: Mon, 3 Jan 2022 16:58:49 +0530 Subject: [PATCH 1/5] fix for #81 --- src/components/Dropzone.svelte | 82 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/src/components/Dropzone.svelte b/src/components/Dropzone.svelte index aed1aa4..38b8e6c 100644 --- a/src/components/Dropzone.svelte +++ b/src/components/Dropzone.svelte @@ -9,7 +9,7 @@ isIeOrEdge, isPropagationStopped, onDocumentDragOver, - TOO_MANY_FILES_REJECTION + TOO_MANY_FILES_REJECTION, } from "./../utils/index"; import { onMount, onDestroy, createEventDispatcher } from "svelte"; @@ -45,7 +45,7 @@ isDragReject: false, draggedFiles: [], acceptedFiles: [], - fileRejections: [] + fileRejections: [], }; let rootRef; @@ -112,7 +112,7 @@ dragTargetsRef = [...dragTargetsRef, event.target]; if (isEvtWithFiles(event)) { - Promise.resolve(getFilesFromEvent(event)).then(draggedFiles => { + Promise.resolve(getFilesFromEvent(event)).then((draggedFiles) => { if (isPropagationStopped(event) && !noDragEventsBubbling) { return; } @@ -121,7 +121,7 @@ state.isDragActive = true; dispatch("dragenter", { - dragEvent: event + dragEvent: event, }); }); } @@ -139,7 +139,7 @@ if (isEvtWithFiles(event)) { dispatch("dragover", { - dragEvent: event + dragEvent: event, }); } @@ -152,7 +152,7 @@ // Only deactivate once the dropzone and all children have been left const targets = dragTargetsRef.filter( - target => rootRef && rootRef.contains(target) + (target) => rootRef && rootRef.contains(target) ); // Make sure to remove a target present multiple times only once // (Firefox may fire dragenter/dragleave multiple times on the same element) @@ -170,7 +170,7 @@ if (isEvtWithFiles(event)) { dispatch("dragleave", { - dragEvent: event + dragEvent: event, }); } } @@ -182,7 +182,7 @@ dragTargetsRef = []; if (isEvtWithFiles(event)) { - Promise.resolve(getFilesFromEvent(event)).then(files => { + Promise.resolve(getFilesFromEvent(event)).then((files) => { if (isPropagationStopped(event) && !noDragEventsBubbling) { return; } @@ -190,20 +190,20 @@ const acceptedFiles = []; const fileRejections = []; - files.forEach(file => { + files.forEach((file) => { const [accepted, acceptError] = fileAccepted(file, accept); const [sizeMatch, sizeError] = fileMatchSize(file, minSize, maxSize); if (accepted && sizeMatch) { acceptedFiles.push(file); } else { - const errors = [acceptError, sizeError].filter(e => e); + const errors = [acceptError, sizeError].filter((e) => e); fileRejections.push({ file, errors }); } }); if (!multiple && acceptedFiles.length > 1) { // Reject everything and empty accepted files - acceptedFiles.forEach(file => { + acceptedFiles.forEach((file) => { fileRejections.push({ file, errors: [TOO_MANY_FILES_REJECTION] }); }); acceptedFiles.splice(0); @@ -215,20 +215,20 @@ dispatch("drop", { acceptedFiles, fileRejections, - event + event, }); if (fileRejections.length > 0) { dispatch("droprejected", { fileRejections, - event + event, }); } if (acceptedFiles.length > 0) { dispatch("dropaccepted", { acceptedFiles, - event + event, }); } }); @@ -290,10 +290,10 @@ }); onDestroy(() => { - window.removeEventListener("focus", onWindowFocus, false); + window && window.removeEventListener("focus", onWindowFocus, false); if (preventDropOnDocument) { - document.removeEventListener("dragover", onDocumentDragOver); - document.removeEventListener("drop", onDocumentDrop); + document && document.removeEventListener("dragover", onDocumentDragOver); + document && document.removeEventListener("drop", onDocumentDrop); } }); @@ -302,27 +302,6 @@ } - -
+ on:drop={composeDragHandler(onDropCb)} +> + style="display: none;" + />

Drag 'n' drop some files here, or click to select files

+ + From 6afb926f79eb3c4778fc74468ca6598d8c839d9f Mon Sep 17 00:00:00 2001 From: Srikanth Adi Date: Mon, 3 Jan 2022 17:00:24 +0530 Subject: [PATCH 2/5] 0.0.16-dev.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf49091..ad33832 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "svelte-file-dropzone", - "version": "0.0.15", + "version": "0.0.16-dev.0", "description": "Svelte component for fileupload and file dropzone", "svelte": "src/components/Dropzone.svelte", "module": "dist/index.mjs", From f93351c10b141fb60c77d86bd64fba9d9301d717 Mon Sep 17 00:00:00 2001 From: Srikanth Adi Date: Wed, 5 Jan 2022 19:18:07 +0530 Subject: [PATCH 3/5] use sveltekit browser env for #81 fix --- src/components/Dropzone.svelte | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/components/Dropzone.svelte b/src/components/Dropzone.svelte index 38b8e6c..23cb904 100644 --- a/src/components/Dropzone.svelte +++ b/src/components/Dropzone.svelte @@ -1,4 +1,5 @@