@vaadin/upload 24.0.0 → 24.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "24.0.0",
+  "version": "24.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -36,12 +36,12 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "~24.0.0",
-    "@vaadin/component-base": "~24.0.0",
-    "@vaadin/progress-bar": "~24.0.0",
-    "@vaadin/vaadin-lumo-styles": "~24.0.0",
-    "@vaadin/vaadin-material-styles": "~24.0.0",
-    "@vaadin/vaadin-themable-mixin": "~24.0.0",
+    "@vaadin/button": "~24.0.2",
+    "@vaadin/component-base": "~24.0.2",
+    "@vaadin/progress-bar": "~24.0.2",
+    "@vaadin/vaadin-lumo-styles": "~24.0.2",
+    "@vaadin/vaadin-material-styles": "~24.0.2",
+    "@vaadin/vaadin-themable-mixin": "~24.0.2",
     "lit": "^2.0.0"
   },
   "devDependencies": {
@@ -53,5 +53,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "b0cf651bb624d74b78a42b3e3ea889b2e401daec"
+  "gitHead": "b349227fa277573b79d94eb0d94c1556b79c55e8"
 }

package/src/vaadin-upload.js

@@ -492,6 +492,26 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
     ];
   }
 
+  /** @private */
+  get __acceptRegexp() {
+    if (!this.accept) {
+      return null;
+    }
+    const processedTokens = this.accept.split(',').map((token) => {
+      let processedToken = token.trim();
+      // Escape regex operators common to mime types
+      processedToken = processedToken.replace(/[+.]/gu, '\\$&');
+      // Make extension patterns match the end of the file name
+      if (processedToken.startsWith('\\.')) {
+        processedToken = `.*${processedToken}$`;
+      }
+      // Handle star (*) wildcards
+      return processedToken.replace(/\/\*/gu, '/.*');
+    });
+    // Create accept regex
+    return new RegExp(`^(${processedTokens.join('|')})$`, 'iu');
+  }
+
   /** @protected */
   ready() {
     super.ready();
@@ -879,12 +899,8 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
       );
       return;
     }
-    const fileExt = file.name.match(/\.[^.]*$|$/u)[0];
-    // Escape regex operators common to mime types
-    const escapedAccept = this.accept.replace(/[+.]/gu, '\\$&');
-    // Create accept regex that can match comma separated patterns, star (*) wildcards
-    const re = new RegExp(`^(${escapedAccept.replace(/[, ]+/gu, '|').replace(/\/\*/gu, '/.*')})$`, 'iu');
-    if (this.accept && !(re.test(file.type) || re.test(fileExt))) {
+    const re = this.__acceptRegexp;
+    if (re && !(re.test(file.type) || re.test(file.name))) {
       this.dispatchEvent(
         new CustomEvent('file-reject', {
           detail: { file, error: this.i18n.error.incorrectFileType },

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/upload",
-  "version": "24.0.0",
+  "version": "24.0.2",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/upload",
-  "version": "24.0.0",
+  "version": "24.0.2",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {