@umbraco-ui/uui-file-dropzone 1.9.0-rc.1 → 1.9.0-rc.2

package/lib/index.js

@@ -82,7 +82,7 @@ let UUIFileDropzoneElement = class extends LabelMixin("", LitElement) {
         if (this._isAccepted(file)) {
           files.push(file);
         }
-      } else if (!this.disallowFolderUpload) {
+      } else if (!this.disallowFolderUpload && this.multiple) {
         const dir = this._getEntry(entry);
         if (dir) {
           const structure = await this._mkdir(dir);
@@ -130,7 +130,7 @@ let UUIFileDropzoneElement = class extends LabelMixin("", LitElement) {
               folders.push(directory);
             }
           }
-          readEntries(reader2);
+          await readEntries(reader2);
           resolve();
         }, reject);
       });
@@ -148,10 +148,10 @@ let UUIFileDropzoneElement = class extends LabelMixin("", LitElement) {
     if (fileExtension && this._acceptedFileExtensions.includes(fileExtension.toLowerCase())) {
       return true;
     }
-    for (const mimeType in this._acceptedMimeTypes) {
+    for (const mimeType of this._acceptedMimeTypes) {
       if (fileType === mimeType) {
         return true;
-      } else if (mimeType.endsWith("/*") && fileType.startsWith(mimeType.replace("/*", ""))) {
+      } else if (mimeType.endsWith("/*") && fileType.startsWith(mimeType.replace("*", ""))) {
         return true;
       }
     }
@@ -168,8 +168,11 @@ let UUIFileDropzoneElement = class extends LabelMixin("", LitElement) {
       const fileSystemResult = await this._getAllEntries(items);
       if (this.multiple === false && fileSystemResult.files.length) {
         fileSystemResult.files = [fileSystemResult.files[0]];
+        fileSystemResult.folders = [];
+      }
+      if (!fileSystemResult.files.length && !fileSystemResult.folders.length) {
+        return;
       }
-      this._getAllEntries(items);
       this.dispatchEvent(
         new UUIFileDropzoneEvent(UUIFileDropzoneEvent.CHANGE, {
           detail: fileSystemResult
@@ -190,9 +193,16 @@ let UUIFileDropzoneElement = class extends LabelMixin("", LitElement) {
   }
   _onFileInputChange() {
     const files = this._input.files ? Array.from(this._input.files) : [];
+    if (this.multiple === false && files.length > 1) {
+      files.splice(1, files.length - 1);
+    }
+    const allowedFiles = files.filter((file) => this._isAccepted(file));
+    if (!allowedFiles.length) {
+      return;
+    }
     this.dispatchEvent(
       new UUIFileDropzoneEvent(UUIFileDropzoneEvent.CHANGE, {
-        detail: { files }
+        detail: { files: allowedFiles, folders: [] }
       })
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-file-dropzone",
-  "version": "1.9.0-rc.1",
+  "version": "1.9.0-rc.2",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -42,5 +42,5 @@
     "access": "public"
   },
   "homepage": "https://uui.umbraco.com/?path=/story/uui-file-dropzone",
-  "gitHead": "7092b4717d8b9d4825b15e087508b8f75bf81a92"
+  "gitHead": "39d5e62e7481783219cbccbf8a58468c962f095a"
 }