@vaadin/upload 24.4.6 → 24.5.0-alpha10

package/README.md

@@ -53,7 +53,7 @@ import '@vaadin/upload/src/vaadin-upload.js';
 
 ## Contributing
 
-Read the [contributing guide](https://vaadin.com/docs/latest/contributing/overview) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.
+Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "24.4.6",
+  "version": "24.5.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -42,23 +42,23 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "~24.4.6",
-    "@vaadin/button": "~24.4.6",
-    "@vaadin/component-base": "~24.4.6",
-    "@vaadin/progress-bar": "~24.4.6",
-    "@vaadin/vaadin-lumo-styles": "~24.4.6",
-    "@vaadin/vaadin-material-styles": "~24.4.6",
-    "@vaadin/vaadin-themable-mixin": "~24.4.6",
+    "@vaadin/a11y-base": "24.5.0-alpha10",
+    "@vaadin/button": "24.5.0-alpha10",
+    "@vaadin/component-base": "24.5.0-alpha10",
+    "@vaadin/progress-bar": "24.5.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "24.5.0-alpha10",
+    "@vaadin/vaadin-material-styles": "24.5.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "24.5.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/testing-helpers": "^0.6.0",
-    "sinon": "^13.0.2"
+    "@vaadin/chai-plugins": "24.5.0-alpha10",
+    "@vaadin/testing-helpers": "^1.0.0",
+    "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "46d3cdb72eb99d544c7bb86c3de95043b9e5857f"
+  "gitHead": "6f9c37308031af872a98017bfab4de89aeacda51"
 }

package/src/vaadin-upload-mixin.js

@@ -576,7 +576,7 @@ export const UploadMixin = (superClass) =>
       if (typeof this.headers === 'string') {
         try {
           this.headers = JSON.parse(this.headers);
-        } catch (e) {
+        } catch (_) {
           this.headers = undefined;
         }
       }
@@ -697,7 +697,9 @@ export const UploadMixin = (superClass) =>
 
       const formData = new FormData();
 
-      file.uploadTarget = file.uploadTarget || this.target || '';
+      if (!file.uploadTarget) {
+        file.uploadTarget = this.target || '';
+      }
       file.formDataName = this.formDataName;
 
       const evt = this.dispatchEvent(
@@ -751,6 +753,7 @@ export const UploadMixin = (superClass) =>
       );
       if (evt) {
         this._uploadFile(file);
+        this._updateFocus(this.files.indexOf(file));
       }
     }
 
@@ -825,13 +828,27 @@ export const UploadMixin = (superClass) =>
       }
     }
 
+    /** @private */
+    _updateFocus(fileIndex) {
+      if (this.files.length === 0) {
+        this._addButton.focus();
+        return;
+      }
+      const lastFileRemoved = fileIndex === this.files.length;
+      if (lastFileRemoved) {
+        fileIndex -= 1;
+      }
+      this._fileList.children[fileIndex].firstElementChild.focus();
+    }
+
     /**
      * Remove file from upload list. Called internally if file upload was canceled.
      * @param {!UploadFile} file File to remove
      * @protected
      */
     _removeFile(file) {
-      if (this.files.indexOf(file) > -1) {
+      const fileIndex = this.files.indexOf(file);
+      if (fileIndex >= 0) {
         this.files = this.files.filter((i) => i !== file);
 
         this.dispatchEvent(
@@ -841,6 +858,8 @@ export const UploadMixin = (superClass) =>
             composed: true,
           }),
         );
+
+        this._updateFocus(fileIndex);
       }
     }
 

package/theme/lumo/vaadin-upload-styles.js

@@ -21,7 +21,9 @@ registerStyles(
       border: 1px dashed var(--lumo-contrast-20pct);
       border-radius: var(--lumo-border-radius-l);
       padding: var(--lumo-space-m);
-      transition: background-color 0.6s, border-color 0.6s;
+      transition:
+        background-color 0.6s,
+        border-color 0.6s;
     }
 
     [part='drop-label'] {
@@ -35,7 +37,9 @@ registerStyles(
     :host([dragover-valid]) {
       border-color: var(--lumo-primary-color-50pct);
       background: var(--lumo-primary-color-10pct);
-      transition: background-color 0.1s, border-color 0.1s;
+      transition:
+        background-color 0.1s,
+        border-color 0.1s;
     }
 
     :host([dragover-valid]) [part='drop-label'] {

package/theme/material/vaadin-upload-styles.js

@@ -63,7 +63,9 @@ registerStyles(
       background-color: var(--material-primary-color);
       opacity: 0;
       transform: translate(-50%, -50%) scale(0);
-      transition: transform 0s cubic-bezier(0.075, 0.82, 0.165, 1), opacity 0.4s linear;
+      transition:
+        transform 0s cubic-bezier(0.075, 0.82, 0.165, 1),
+        opacity 0.4s linear;
       transition-delay: 0.4s, 0s;
     }
 
@@ -210,7 +212,9 @@ registerStyles(
       background-color: var(--material-body-text-color);
       transform: scale(0);
       opacity: 0;
-      transition: transform 0.08s, opacity 0.01s;
+      transition:
+        transform 0.08s,
+        opacity 0.01s;
       will-change: transform, opacity;
     }
 

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/upload",
-  "version": "24.4.6",
+  "version": "24.5.0-alpha10",
   "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.4.6",
+  "version": "24.5.0-alpha10",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {