@vaadin/upload 24.0.0-alpha6 → 24.0.0-alpha8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "24.0.0-alpha6",
+  "version": "24.0.0-alpha8",
   "publishConfig": {
     "access": "public"
   },
@@ -36,16 +36,16 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "24.0.0-alpha6",
-    "@vaadin/component-base": "24.0.0-alpha6",
-    "@vaadin/progress-bar": "24.0.0-alpha6",
-    "@vaadin/vaadin-lumo-styles": "24.0.0-alpha6",
-    "@vaadin/vaadin-material-styles": "24.0.0-alpha6",
-    "@vaadin/vaadin-themable-mixin": "24.0.0-alpha6"
+    "@vaadin/button": "24.0.0-alpha8",
+    "@vaadin/component-base": "24.0.0-alpha8",
+    "@vaadin/progress-bar": "24.0.0-alpha8",
+    "@vaadin/vaadin-lumo-styles": "24.0.0-alpha8",
+    "@vaadin/vaadin-material-styles": "24.0.0-alpha8",
+    "@vaadin/vaadin-themable-mixin": "24.0.0-alpha8"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/form-layout": "24.0.0-alpha6",
+    "@vaadin/form-layout": "24.0.0-alpha8",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
@@ -53,5 +53,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "0004ac92b6e5f415b5fa949e0582d1d11e527b1f"
+  "gitHead": "476752249bb12295c500980d98a3256ad3b22b73"
 }

package/src/vaadin-upload-file-list.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import './vaadin-upload-file.js';

package/src/vaadin-upload-file.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import '@vaadin/progress-bar/src/vaadin-progress-bar.js';

package/src/vaadin-upload-icon.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';

package/src/vaadin-upload-icons.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 const template = document.createElement('template');

package/src/vaadin-upload.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';

package/src/vaadin-upload.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2016 - 2022 Vaadin Ltd.
+ * Copyright (c) 2016 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import '@polymer/polymer/lib/elements/dom-repeat.js';
@@ -16,6 +16,59 @@ import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
+class AddButtonController extends SlotController {
+  constructor(host) {
+    super(host, 'add-button', 'vaadin-button');
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to add listeners to default and custom node.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    // Needed by Flow counterpart to apply i18n to custom button
+    if (node._isDefault) {
+      this.defaultNode = node;
+    }
+
+    node.addEventListener('touchend', (e) => {
+      this.host._onAddFilesTouchEnd(e);
+    });
+
+    node.addEventListener('click', (e) => {
+      this.host._onAddFilesClick(e);
+    });
+
+    this.host._addButton = node;
+  }
+}
+
+class DropLabelController extends SlotController {
+  constructor(host) {
+    super(host, 'drop-label', 'span');
+  }
+
+  /**
+   * Override method inherited from `SlotController`
+   * to add listeners to default and custom node.
+   *
+   * @param {Node} node
+   * @protected
+   * @override
+   */
+  initNode(node) {
+    // Needed by Flow counterpart to apply i18n to custom label
+    if (node._isDefault) {
+      this.defaultNode = node;
+    }
+    this.host._dropLabel = node;
+  }
+}
+
 /**
  * `<vaadin-upload>` is a Web Component for uploading multiple files with drag and drop support.
  *
@@ -453,27 +506,11 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
     this.addEventListener('upload-success', this._onUploadSuccess.bind(this));
     this.addEventListener('upload-error', this._onUploadError.bind(this));
 
-    this.addController(
-      new SlotController(this, 'add-button', 'vaadin-button', {
-        initializer: (button) => {
-          button.addEventListener('touchend', (e) => {
-            this._onAddFilesTouchEnd(e);
-          });
-          button.addEventListener('click', (e) => {
-            this._onAddFilesClick(e);
-          });
-          this._addButton = button;
-        },
-      }),
-    );
+    this._addButtonController = new AddButtonController(this);
+    this.addController(this._addButtonController);
 
-    this.addController(
-      new SlotController(this, 'drop-label', 'span', {
-        initializer: (label) => {
-          this._dropLabel = label;
-        },
-      }),
-    );
+    this._dropLabelController = new DropLabelController(this);
+    this.addController(this._dropLabelController);
 
     this.addController(
       new SlotController(this, 'file-list', 'vaadin-upload-file-list', {
@@ -551,13 +588,18 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
   __updateAddButton(addButton, maxFiles, i18n, maxFilesReached) {
     if (addButton) {
       addButton.disabled = maxFilesReached;
-      addButton.textContent = this._i18nPlural(maxFiles, i18n.addFiles);
+
+      // Only update text content for the default button element
+      if (addButton === this._addButtonController.defaultNode) {
+        addButton.textContent = this._i18nPlural(maxFiles, i18n.addFiles);
+      }
     }
   }
 
   /** @private */
   __updateDropLabel(dropLabel, maxFiles, i18n) {
-    if (dropLabel) {
+    // Only update text content for the default label element
+    if (dropLabel && dropLabel === this._dropLabelController.defaultNode) {
       dropLabel.textContent = this._i18nPlural(maxFiles, i18n.dropFiles);
     }
   }
@@ -637,11 +679,10 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
    *
    * @param {!UploadFile | !Array<!UploadFile>=} files - Files being uploaded. Defaults to all outstanding files
    */
-  uploadFiles(files) {
+  uploadFiles(files = this.files) {
     if (files && !Array.isArray(files)) {
       files = [files];
     }
-    files = files || this.files;
     files = files.filter((file) => !file.complete);
     Array.prototype.forEach.call(files, this._uploadFile.bind(this));
   }
@@ -838,11 +879,11 @@ class Upload extends ElementMixin(ThemableMixin(ControllerMixin(PolymerElement))
       );
       return;
     }
-    const fileExt = file.name.match(/\.[^.]*$|$/)[0];
+    const fileExt = file.name.match(/\.[^.]*$|$/u)[0];
     // Escape regex operators common to mime types
-    const escapedAccept = this.accept.replace(/[+.]/g, '\\$&');
+    const escapedAccept = this.accept.replace(/[+.]/gu, '\\$&');
     // Create accept regex that can match comma separated patterns, star (*) wildcards
-    const re = new RegExp(`^(${escapedAccept.replace(/[, ]+/g, '|').replace(/\/\*/g, '/.*')})$`, 'i');
+    const re = new RegExp(`^(${escapedAccept.replace(/[, ]+/gu, '|').replace(/\/\*/gu, '/.*')})$`, 'iu');
     if (this.accept && !(re.test(file.type) || re.test(fileExt))) {
       this.dispatchEvent(
         new CustomEvent('file-reject', {

package/web-types.json

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