@vaadin/upload 25.0.0-alpha10 → 25.0.0-alpha12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "25.0.0-alpha10",
+  "version": "25.0.0-alpha12",
   "publishConfig": {
     "access": "public"
   },
@@ -21,9 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "!src/styles/*-base-styles.d.ts",
-    "!src/styles/*-base-styles.js",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -37,23 +34,23 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@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",
+    "@vaadin/a11y-base": "25.0.0-alpha12",
+    "@vaadin/button": "25.0.0-alpha12",
+    "@vaadin/component-base": "25.0.0-alpha12",
+    "@vaadin/progress-bar": "25.0.0-alpha12",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha12",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha10",
-    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/chai-plugins": "25.0.0-alpha12",
+    "@vaadin/test-runner-commands": "25.0.0-alpha12",
     "@vaadin/testing-helpers": "^2.0.0",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha12",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
+  "gitHead": "e75527348f9ba7c363d068c868b9f030c15b84a1"
 }

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

@@ -3,7 +3,7 @@
  * 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 '@vaadin/component-base/src/styles/style-props.js';
 import { css } from 'lit';
 
 export const uploadStyles = css`

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

@@ -3,7 +3,7 @@
  * 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 '@vaadin/component-base/src/styles/style-props.js';
 import { css } from 'lit';
 
 export const uploadFileStyles = css`

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

@@ -3,7 +3,7 @@
  * 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 '@vaadin/component-base/src/styles/style-props.js';
 import { css } from 'lit';
 
 export const uploadFileListStyles = css`

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

@@ -3,7 +3,7 @@
  * 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 '@vaadin/component-base/src/styles/style-props.js';
 import { css } from 'lit';
 
 export const uploadIconStyles = css`

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

@@ -9,7 +9,7 @@ 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 { uploadFileListStyles } from './styles/vaadin-upload-file-list-base-styles.js';
 import { UploadFileListMixin } from './vaadin-upload-file-list-mixin.js';
 
 /**

package/src/vaadin-upload-file.js

@@ -10,7 +10,7 @@ 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 { uploadFileStyles } from './styles/vaadin-upload-file-core-styles.js';
+import { uploadFileStyles } from './styles/vaadin-upload-file-base-styles.js';
 import { UploadFileMixin } from './vaadin-upload-file-mixin.js';
 
 /**

package/src/vaadin-upload-icon.js

@@ -7,7 +7,7 @@ import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { uploadIconStyles } from './styles/vaadin-upload-icon-core-styles.js';
+import { uploadIconStyles } from './styles/vaadin-upload-icon-base-styles.js';
 
 /**
  * An element used internally by `<vaadin-upload>`. Not intended to be used separately.

package/src/vaadin-upload.js

@@ -14,7 +14,7 @@ import { ElementMixin } from '@vaadin/component-base/src/element-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 { uploadStyles } from './styles/vaadin-upload-core-styles.js';
+import { uploadStyles } from './styles/vaadin-upload-base-styles.js';
 import { UploadMixin } from './vaadin-upload-mixin.js';
 
 /**

package/vaadin-upload.js

@@ -1,2 +1,2 @@
-import './theme/lumo/vaadin-upload.js';
+import './src/vaadin-upload.js';
 export * from './src/vaadin-upload.js';

package/web-types.json

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

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

@@ -1,8 +0,0 @@
-/**
- * @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

@@ -1,22 +0,0 @@
-/**
- * @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-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @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-core-styles.js

@@ -1,32 +0,0 @@
-/**
- * @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 uploadFileStyles = css`
-  :host {
-    display: block;
-  }
-
-  [hidden] {
-    display: none;
-  }
-
-  [part='row'] {
-    list-style-type: none;
-  }
-
-  button {
-    background: transparent;
-    padding: 0;
-    border: none;
-    box-shadow: none;
-  }
-
-  :host([complete]) ::slotted([slot='progress']),
-  :host([error]) ::slotted([slot='progress']) {
-    display: none !important;
-  }
-`;

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

@@ -1,8 +0,0 @@
-/**
- * @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

@@ -1,22 +0,0 @@
-/**
- * @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-core-styles.d.ts

@@ -1,8 +0,0 @@
-/**
- * @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

@@ -1,16 +0,0 @@
-/**
- * @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/theme/lumo/vaadin-upload-styles.d.ts

@@ -1,8 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import '@vaadin/button/theme/lumo/vaadin-button-styles.js';
-import '@vaadin/progress-bar/theme/lumo/vaadin-progress-bar-styles.js';

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

@@ -1,192 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import '@vaadin/button/theme/lumo/vaadin-button-styles.js';
-import '@vaadin/progress-bar/theme/lumo/vaadin-progress-bar-styles.js';
-import { fieldButton } from '@vaadin/vaadin-lumo-styles/mixins/field-button.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-upload',
-  css`
-    :host {
-      line-height: var(--lumo-line-height-m);
-    }
-
-    :host(:not([nodrop])) {
-      overflow: hidden;
-      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;
-    }
-
-    [part='drop-label'] {
-      display: inline-block;
-      white-space: normal;
-      padding: 0 var(--lumo-space-s);
-      color: var(--lumo-secondary-text-color);
-      font-family: var(--lumo-font-family);
-    }
-
-    :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;
-    }
-
-    :host([dragover-valid]) [part='drop-label'] {
-      color: var(--lumo-primary-text-color);
-    }
-
-    :host([disabled]) [part='drop-label'],
-    :host([max-files-reached]) [part='drop-label'] {
-      color: var(--lumo-disabled-text-color);
-    }
-  `,
-  { moduleId: 'lumo-upload' },
-);
-
-registerStyles(
-  'vaadin-upload-icon',
-  css`
-    :host::before {
-      content: var(--lumo-icons-upload);
-      font-family: lumo-icons;
-      font-size: var(--lumo-icon-size-m);
-      line-height: 1;
-      vertical-align: -0.25em;
-    }
-  `,
-  { moduleId: 'lumo-upload-icon' },
-);
-
-registerStyles(
-  'vaadin-upload-file-list',
-  css`
-    ::slotted(li:not(:first-of-type)) {
-      border-top: 1px solid var(--lumo-contrast-10pct);
-    }
-  `,
-  { moduleId: 'lumo-upload-file-list' },
-);
-
-const uploadFile = css`
-  :host {
-    padding: var(--lumo-space-s) 0;
-    outline: none;
-    --_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-primary-color-50pct));
-    --_focus-ring-width: var(--vaadin-focus-ring-width, 2px);
-  }
-
-  :host([focus-ring]) [part='row'] {
-    border-radius: var(--lumo-border-radius-s);
-    box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-  }
-
-  [part='row'] {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-  }
-
-  [part='status'],
-  [part='error'] {
-    color: var(--lumo-secondary-text-color);
-    font-size: var(--lumo-font-size-s);
-  }
-
-  [part='info'] {
-    display: flex;
-    align-items: baseline;
-    flex: auto;
-  }
-
-  [part='meta'] {
-    width: 0.001px;
-    flex: 1 1 auto;
-  }
-
-  [part='name'] {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  [part='commands'] {
-    display: flex;
-    align-items: baseline;
-    flex: none;
-  }
-
-  [part$='icon'] {
-    margin-right: var(--lumo-space-xs);
-    font-size: var(--lumo-icon-size-m);
-    font-family: 'lumo-icons';
-    line-height: 1;
-  }
-
-  /* When both icons are hidden, let us keep space for one */
-  [part='done-icon'][hidden] + [part='warning-icon'][hidden] {
-    display: block !important;
-    visibility: hidden;
-  }
-
-  [part$='button'] {
-    flex: none;
-    margin-left: var(--lumo-space-xs);
-    cursor: var(--lumo-clickable-cursor);
-  }
-
-  [part$='button']:focus {
-    outline: none;
-    border-radius: var(--lumo-border-radius-s);
-    box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-  }
-
-  [part$='icon']::before,
-  [part$='button']::before {
-    vertical-align: -0.25em;
-  }
-
-  [part='done-icon']::before {
-    content: var(--lumo-icons-checkmark);
-    color: var(--lumo-primary-text-color);
-  }
-
-  [part='warning-icon']::before {
-    content: var(--lumo-icons-error);
-    color: var(--lumo-error-text-color);
-  }
-
-  [part='start-button']::before {
-    content: var(--lumo-icons-play);
-  }
-
-  [part='retry-button']::before {
-    content: var(--lumo-icons-reload);
-  }
-
-  [part='remove-button']::before {
-    content: var(--lumo-icons-cross);
-  }
-
-  [part='error'] {
-    color: var(--lumo-error-text-color);
-  }
-
-  ::slotted([slot='progress']) {
-    width: auto;
-    margin-left: calc(var(--lumo-icon-size-m) + var(--lumo-space-xs));
-    margin-right: calc(var(--lumo-icon-size-m) + var(--lumo-space-xs));
-  }
-`;
-
-registerStyles('vaadin-upload-file', [fieldButton, uploadFile], { moduleId: 'lumo-upload-file' });

package/theme/lumo/vaadin-upload.d.ts

@@ -1,2 +0,0 @@
-import './vaadin-upload-styles.js';
-import '../../src/vaadin-upload.js';

package/theme/lumo/vaadin-upload.js

@@ -1,2 +0,0 @@
-import './vaadin-upload-styles.js';
-import '../../src/vaadin-upload.js';