@vaadin/upload 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -28,29 +28,6 @@ Once installed, import the component in your application:
 import '@vaadin/upload';
 ```
 
-## Themes
-
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
-The [main entrypoint](https://github.com/vaadin/web-components/blob/main/packages/upload/vaadin-upload.js) of the package uses the Lumo theme.
-
-To use the Material theme, import the component from the `theme/material` folder:
-
-```js
-import '@vaadin/upload/theme/material/vaadin-upload.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/upload/theme/lumo/vaadin-upload.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/upload/src/vaadin-upload.js';
-```
-
 ## Contributing
 
 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -31,30 +33,27 @@
     "Vaadin",
     "upload",
     "web-components",
-    "web-component",
-    "polymer"
+    "web-component"
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "~24.8.4",
-    "@vaadin/button": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/progress-bar": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/button": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/progress-bar": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

package/src/styles/vaadin-upload-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadStyles: CSSResult;

package/src/styles/vaadin-upload-base-styles.js

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/style-props.js';
+import { css } from 'lit';
+
+export const uploadStyles = css`
+  :host {
+    background: var(--vaadin-upload-background, transparent);
+    border: var(
+      --vaadin-upload-border,
+      var(--vaadin-upload-border-width, 1px) solid var(--vaadin-upload-border-color, var(--vaadin-border-color))
+    );
+    border-radius: var(--vaadin-upload-border-radius, var(--vaadin-radius-m));
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    padding: var(--vaadin-upload-padding, var(--vaadin-padding));
+    position: relative;
+  }
+
+  :host([dragover-valid]) {
+    --vaadin-upload-background: var(--vaadin-background-container);
+    --vaadin-upload-border: 1px dashed var(--vaadin-color);
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  [hidden] {
+    display: none !important;
+  }
+
+  [part='primary-buttons'] {
+    align-items: center;
+    display: flex;
+    gap: var(--vaadin-gap-container-inline);
+  }
+
+  [part='drop-label'] {
+    align-items: center;
+    color: var(--vaadin-upload-drop-label-color, var(--vaadin-color));
+    display: flex;
+    font-size: var(--vaadin-upload-drop-label-font-size, inherit);
+    font-weight: var(--vaadin-upload-drop-label-font-weight, inherit);
+    gap: var(--vaadin-upload-drop-label-gap, var(--vaadin-gap-container-inline));
+    line-height: var(--vaadin-upload-drop-label-line-height, inherit);
+  }
+
+  :host([nodrop]) {
+    --vaadin-upload-border: none;
+    --vaadin-upload-border-radius: 0;
+    --vaadin-upload-padding: 0;
+  }
+`;

package/src/styles/vaadin-upload-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadStyles: CSSResult;

package/src/styles/vaadin-upload-core-styles.js

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+
+export const uploadStyles = css`
+  :host {
+    display: block;
+    position: relative;
+    box-sizing: border-box;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  [hidden] {
+    display: none !important;
+  }
+`;

package/src/styles/vaadin-upload-file-base-styles.js

@@ -0,0 +1,137 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/style-props.js';
+import { css } from 'lit';
+
+export const uploadFileStyles = css`
+  :host {
+    align-items: center;
+    display: grid;
+    gap: var(--vaadin-upload-file-gap, var(--vaadin-gap-container-block));
+    grid-template-columns: var(--vaadin-icon-size, 1lh) minmax(0, 1fr) auto;
+    padding: var(--vaadin-upload-file-padding, var(--vaadin-padding));
+  }
+
+  [hidden] {
+    display: none;
+  }
+
+  [part='row'] {
+    display: contents;
+  }
+
+  [part='info'] {
+    display: contents;
+  }
+
+  [part='done-icon']:not([hidden]),
+  [part='warning-icon']:not([hidden]) {
+    display: flex;
+  }
+
+  [part='done-icon']::before,
+  [part='warning-icon']::before {
+    content: '';
+    display: inline-block;
+    flex: none;
+    height: var(--vaadin-icon-size, 1lh);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  [part='done-icon']::before {
+    background: var(--vaadin-upload-file-done-color, currentColor);
+    mask-image: var(--_vaadin-icon-checkmark);
+  }
+
+  [part='warning-icon']::before {
+    background: var(--vaadin-upload-file-warning-color, currentColor);
+    mask-image: var(--_vaadin-icon-warn);
+  }
+
+  [part='meta'] {
+    grid-column: 2;
+  }
+
+  [part='name'] {
+    color: var(--vaadin-upload-file-name-color, var(--vaadin-color));
+    font-size: var(--vaadin-upload-file-name-font-size, inherit);
+    font-weight: var(--vaadin-upload-file-name-font-weight, inherit);
+    line-height: var(--vaadin-upload-file-name-line-height, inherit);
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  [part='status'] {
+    color: var(--vaadin-upload-file-status-color, var(--vaadin-color-subtle));
+    font-size: var(--vaadin-upload-file-status-font-size, inherit);
+    font-weight: var(--vaadin-upload-file-status-font-weight, inherit);
+    line-height: var(--vaadin-upload-file-status-line-height, inherit);
+  }
+
+  [part='error'] {
+    color: var(--vaadin-upload-file-error-color, var(--vaadin-color));
+    font-size: var(--vaadin-upload-file-error-font-size, inherit);
+    font-weight: var(--vaadin-upload-file-error-font-weight, inherit);
+    line-height: var(--vaadin-upload-file-error-line-height, inherit);
+  }
+
+  button {
+    background: var(--vaadin-upload-file-button-background, transparent);
+    border: var(
+      --vaadin-upload-file-button-border,
+      var(--vaadin-upload-file-button-border-width, 1px) solid
+        var(--vaadin-upload-file-button-border-color, transparent)
+    );
+    border-radius: var(--vaadin-upload-file-button-border-radius, var(--vaadin-radius-m));
+    color: var(--vaadin-upload-file-button-text-color, var(--vaadin-color));
+    cursor: var(--vaadin-clickable-cursor);
+    flex-shrink: 0;
+    font-family: var(--vaadin-upload-file-button-font-family, inherit);
+    font-size: var(--vaadin-upload-file-button-font-size, inherit);
+    font-weight: var(--vaadin-upload-file-button-font-weight, 500);
+    height: var(--vaadin-upload-file-button-height, auto);
+    line-height: var(--vaadin-upload-file-button-line-height, inherit);
+    padding: var(--vaadin-upload-file-button-padding, var(--vaadin-padding-container));
+  }
+
+  [part='start-button']::before,
+  [part='retry-button']::before,
+  [part='remove-button']::before {
+    background: currentColor;
+    content: '';
+    display: block;
+    height: var(--vaadin-icon-size, 1lh);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  [part='start-button']::before {
+    mask-image: var(--_vaadin-icon-play);
+  }
+
+  [part='retry-button']::before {
+    mask-image: var(--_vaadin-icon-refresh);
+  }
+
+  [part='remove-button']::before {
+    mask-image: var(--_vaadin-icon-cross);
+  }
+
+  ::slotted([slot='progress']) {
+    grid-column: 2 / -1;
+    width: auto;
+  }
+
+  :host([complete]) ::slotted([slot='progress']),
+  :host([error]) ::slotted([slot='progress']) {
+    display: none;
+  }
+
+  @media (forced-colors: active) {
+    :is([part$='icon'], [part$='button'])::before {
+      background: CanvasText;
+    }
+  }
+`;

package/src/styles/vaadin-upload-file-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadFileStyles: CSSResult;

package/src/styles/vaadin-upload-file-list-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadFileListStyles: CSSResult;

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

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/style-props.js';
+import { css } from 'lit';
+
+export const uploadFileListStyles = css`
+  :host {
+    display: block;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  [part='list'] {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  ::slotted(:first-child) {
+    margin-top: var(--vaadin-upload-gap, var(--vaadin-gap-container-block));
+  }
+
+  ::slotted(li:not(:last-of-type)) {
+    border-bottom: var(
+      --vaadin-upload-file-list-border,
+      var(--vaadin-upload-file-list-border-width, 1px) solid
+        var(--vaadin-upload-file-list-border-color, var(--vaadin-border-color))
+    );
+  }
+`;

package/src/styles/vaadin-upload-file-list-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadFileListStyles: CSSResult;

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

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+
+export const uploadFileListStyles = css`
+  :host {
+    display: block;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  [part='list'] {
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+  }
+`;

package/src/styles/vaadin-upload-icon-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadIconStyles: CSSResult;

package/src/styles/vaadin-upload-icon-base-styles.js

@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/style-props.js';
+import { css } from 'lit';
+
+export const uploadIconStyles = css`
+  :host {
+    display: inline-flex;
+  }
+
+  :host::before {
+    background: var(--vaadin-upload-icon-color, currentColor);
+    content: '';
+    display: inline-block;
+    flex: none;
+    height: var(--vaadin-icon-size, 1lh);
+    mask-image: var(--_vaadin-icon-upload);
+    width: var(--vaadin-icon-size, 1lh);
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  @media (forced-colors: active) {
+    :host::before {
+      background: CanvasText;
+    }
+  }
+`;

package/src/styles/vaadin-upload-icon-core-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const uploadIconStyles: CSSResult;

package/src/styles/vaadin-upload-icon-core-styles.js

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright (c) 2016 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+
+export const uploadIconStyles = css`
+  :host {
+    display: inline-block;
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+`;

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

@@ -4,9 +4,12 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import './vaadin-upload-file.js';
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { uploadFileListStyles } from './styles/vaadin-upload-file-list-core-styles.js';
 import { UploadFileListMixin } from './vaadin-upload-file-list-mixin.js';
 
 /**
@@ -18,28 +21,18 @@ import { UploadFileListMixin } from './vaadin-upload-file-list-mixin.js';
  * @mixes UploadFileListMixin
  * @private
  */
-class UploadFileList extends UploadFileListMixin(ThemableMixin(PolymerElement)) {
+class UploadFileList extends UploadFileListMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))) {
   static get is() {
     return 'vaadin-upload-file-list';
   }
 
-  static get template() {
-    return html`
-      <style>
-        :host {
-          display: block;
-        }
-
-        :host([hidden]) {
-          display: none !important;
-        }
+  static get styles() {
+    return uploadFileListStyles;
+  }
 
-        [part='list'] {
-          padding: 0;
-          margin: 0;
-          list-style-type: none;
-        }
-      </style>
+  /** @protected */
+  render() {
+    return html`
       <ul part="list">
         <slot></slot>
       </ul>

package/src/vaadin-upload-file.d.ts

@@ -3,7 +3,6 @@
  * Copyright (c) 2016 - 2025 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';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { UploadFileMixin } from './vaadin-upload-file-mixin.js';
 
@@ -70,7 +69,7 @@ export interface UploadFileEventMap extends HTMLElementEventMap, UploadFileCusto
  *
  * See [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.
  */
-declare class UploadFile extends UploadFileMixin(ThemableMixin(ControllerMixin(HTMLElement))) {
+declare class UploadFile extends UploadFileMixin(ThemableMixin(HTMLElement)) {
   addEventListener<K extends keyof UploadFileEventMap>(
     type: K,
     listener: (this: UploadFile, ev: UploadFileEventMap[K]) => void,

package/src/vaadin-upload-file.js

@@ -5,14 +5,13 @@
  */
 import '@vaadin/progress-bar/src/vaadin-progress-bar.js';
 import './vaadin-upload-icons.js';
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
+import { html, LitElement, nothing } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
-import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { uploadFileStyles } from './styles/vaadin-upload-file-core-styles.js';
 import { UploadFileMixin } from './vaadin-upload-file-mixin.js';
-import { uploadFileStyles } from './vaadin-upload-file-styles.js';
-
-registerStyles('vaadin-upload-file', uploadFileStyles, { moduleId: 'vaadin-upload-file-styles' });
 
 /**
  * `<vaadin-upload-file>` element represents a file in the file list of `<vaadin-upload>`.
@@ -52,22 +51,30 @@ registerStyles('vaadin-upload-file', uploadFileStyles, { moduleId: 'vaadin-uploa
  *
  * @customElement
  * @extends HTMLElement
- * @mixes ControllerMixin
  * @mixes UploadFileMixin
  * @mixes ThemableMixin
  */
-class UploadFile extends UploadFileMixin(ThemableMixin(ControllerMixin(PolymerElement))) {
-  static get template() {
+class UploadFile extends UploadFileMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))) {
+  static get is() {
+    return 'vaadin-upload-file';
+  }
+
+  static get styles() {
+    return uploadFileStyles;
+  }
+
+  /** @protected */
+  render() {
     return html`
       <div part="row">
         <div part="info">
-          <div part="done-icon" hidden$="[[!complete]]" aria-hidden="true"></div>
-          <div part="warning-icon" hidden$="[[!errorMessage]]" aria-hidden="true"></div>
+          <div part="done-icon" ?hidden="${!this.complete}" aria-hidden="true"></div>
+          <div part="warning-icon" ?hidden="${!this.errorMessage}" aria-hidden="true"></div>
 
           <div part="meta">
-            <div part="name" id="name">[[fileName]]</div>
-            <div part="status" hidden$="[[!status]]" id="status">[[status]]</div>
-            <div part="error" id="error" hidden$="[[!errorMessage]]">[[errorMessage]]</div>
+            <div part="name" id="name">${this.fileName}</div>
+            <div part="status" ?hidden="${!this.status}" id="status">${this.status}</div>
+            <div part="error" id="error" ?hidden="${!this.errorMessage}">${this.errorMessage}</div>
           </div>
         </div>
         <div part="commands">
@@ -75,29 +82,29 @@ class UploadFile extends UploadFileMixin(ThemableMixin(ControllerMixin(PolymerEl
             type="button"
             part="start-button"
             file-event="file-start"
-            on-click="_fireFileEvent"
-            hidden$="[[!held]]"
-            disabled$="[[disabled]]"
-            aria-label$="[[i18n.file.start]]"
+            @click="${this._fireFileEvent}"
+            ?hidden="${!this.held}"
+            ?disabled="${this.disabled}"
+            aria-label="${this.i18n ? this.i18n.file.start : nothing}"
             aria-describedby="name"
           ></button>
           <button
             type="button"
             part="retry-button"
             file-event="file-retry"
-            on-click="_fireFileEvent"
-            hidden$="[[!errorMessage]]"
-            disabled$="[[disabled]]"
-            aria-label$="[[i18n.file.retry]]"
+            @click="${this._fireFileEvent}"
+            ?hidden="${!this.errorMessage}"
+            ?disabled="${this.disabled}"
+            aria-label="${this.i18n ? this.i18n.file.retry : nothing}"
             aria-describedby="name"
           ></button>
           <button
             type="button"
             part="remove-button"
             file-event="file-abort"
-            on-click="_fireFileEvent"
-            disabled$="[[disabled]]"
-            aria-label$="[[i18n.file.remove]]"
+            @click="${this._fireFileEvent}"
+            ?disabled="${this.disabled}"
+            aria-label="${this.i18n ? this.i18n.file.remove : nothing}"
             aria-describedby="name"
           ></button>
         </div>
@@ -107,10 +114,6 @@ class UploadFile extends UploadFileMixin(ThemableMixin(ControllerMixin(PolymerEl
     `;
   }
 
-  static get is() {
-    return 'vaadin-upload-file';
-  }
-
   /**
    * Fired when the retry button is pressed. It is listened by `vaadin-upload`
    * which will start a new upload process of this file.