From deee62175fbe180c096884c7bd1bad4dc8f4bbf6 Mon Sep 17 00:00:00 2001 From: sourabpramanik Date: Wed, 3 Jan 2024 06:49:50 +0530 Subject: [PATCH] fix(input): updated file validation --- src/lib/elements/forms/inputFile.svelte | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index 64864d2ec..792da658c 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -20,18 +20,6 @@ function setFiles(value: FileList) { if (!value) return; - const hasInvalidExt = Array.from(value).some((file) => { - const fileExtension = file.name.split('.').pop(); - return allowedFileExtensions?.length - ? !allowedFileExtensions.includes(fileExtension) - : false; - }); - if (hasInvalidExt) { - error = 'Invalid file extension'; - input.value = null; - return; - } - files = value; input.files = value; } @@ -79,6 +67,20 @@ const handleChange = (event: Event) => { const target = event.currentTarget as HTMLInputElement; + + const isValidFiles = Array.from(target.files).every((file) => { + const fileExtension = file.name.split('.').pop(); + return allowedFileExtensions?.length + ? allowedFileExtensions.includes(fileExtension) + : true; + }); + + if (!isValidFiles) { + error = 'Invalid file extension'; + target.value = ''; + return; + } + setFiles(target.files); };