@vaadin/upload 22.0.0-alpha7 → 22.0.0-alpha8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/upload",
-  "version": "22.0.0-alpha7",
+  "version": "22.0.0-alpha8",
   "publishConfig": {
     "access": "public"
   },
@@ -33,17 +33,17 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/button": "22.0.0-alpha7",
-    "@vaadin/component-base": "22.0.0-alpha7",
-    "@vaadin/progress-bar": "22.0.0-alpha7",
-    "@vaadin/vaadin-lumo-styles": "22.0.0-alpha7",
-    "@vaadin/vaadin-material-styles": "22.0.0-alpha7",
-    "@vaadin/vaadin-themable-mixin": "22.0.0-alpha7"
+    "@vaadin/button": "22.0.0-alpha8",
+    "@vaadin/component-base": "22.0.0-alpha8",
+    "@vaadin/progress-bar": "22.0.0-alpha8",
+    "@vaadin/vaadin-lumo-styles": "22.0.0-alpha8",
+    "@vaadin/vaadin-material-styles": "22.0.0-alpha8",
+    "@vaadin/vaadin-themable-mixin": "22.0.0-alpha8"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.3.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "8e89419c6b44a1d225d5859e180d7b35e47ddb52"
+  "gitHead": "c24468526298ee26ad7f7280b59f6c8789e1f75f"
 }

package/src/vaadin-upload-file.js

@@ -28,7 +28,7 @@ import './vaadin-upload-icons.js';
  * `commands` | Container for file command icons
  * `start-button` | Start file upload button
  * `retry-button` | Retry file upload button
- * `clear-button` | Clear file button
+ * `remove-button` | Remove file button
  * `progress`| Progress bar
  *
  * The following state attributes are available for styling:
@@ -100,10 +100,10 @@ class UploadFile extends ThemableMixin(PolymerElement) {
           ></button>
           <button
             type="button"
-            part="clear-button"
+            part="remove-button"
             file-event="file-abort"
             on-click="_fireFileEvent"
-            aria-label$="[[i18n.file.clear]]"
+            aria-label$="[[i18n.file.remove]]"
             aria-describedby="name"
           ></button>
         </div>

package/src/vaadin-upload.d.ts

@@ -1,8 +1,171 @@
+/**
+ * @license
+ * Copyright (c) 2021 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
-
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
-import { UploadEventMap, UploadFile, UploadI18n, UploadMethod } from './interfaces';
+export interface UploadFile extends File {
+  uploadTarget: string;
+  elapsed: number;
+  elapsedStr: string;
+  remaining: number;
+  remainingStr: string;
+  progress: number;
+  speed: number;
+  totalStr: string;
+  loaded: number;
+  loadedStr: string;
+  status: string;
+  error: string;
+  abort?: boolean;
+  complete?: boolean;
+  uploading?: boolean;
+}
+
+export interface UploadI18n {
+  dropFiles: {
+    one: string;
+    many: string;
+  };
+  addFiles: {
+    one: string;
+    many: string;
+  };
+  error: {
+    tooManyFiles: string;
+    fileIsTooBig: string;
+    incorrectFileType: string;
+  };
+  uploading: {
+    status: {
+      connecting: string;
+      stalled: string;
+      processing: string;
+      held: string;
+    };
+    remainingTime: {
+      prefix: string;
+      unknown: string;
+    };
+    error: {
+      serverUnavailable: string;
+      unexpectedServerError: string;
+      forbidden: string;
+    };
+  };
+  units: {
+    size: string[];
+    sizeBase?: number;
+  };
+  formatSize?: (bytes: number) => string;
+  formatTime?: (seconds: number, units: number[]) => string;
+}
+
+export type UploadMethod = 'POST' | 'PUT';
+
+/**
+ * Fired when a file cannot be added to the queue due to a constrain:
+ * file-size, file-type or maxFiles
+ */
+export type UploadFileRejectEvent = CustomEvent<{ file: UploadFile; error: string }>;
+
+/**
+ * Fired when the `files` property changes.
+ */
+export type UploadFilesChangedEvent = CustomEvent<{ value: UploadFile[] }>;
+
+/**
+ * Fired when the `max-files-reached` property changes.
+ */
+export type UploadMaxFilesReachedChangedEvent = CustomEvent<{ value: boolean }>;
+
+/**
+ * Fired before the XHR is opened. Could be used for changing the request
+ * URL. If the default is prevented, then XHR would not be opened.
+ */
+export type UploadBeforeEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired when the XHR is sent.
+ */
+export type UploadStartEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired as many times as the progress is updated.
+ */
+export type UploadProgressEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired in case the upload process succeeded.
+ */
+export type UploadSuccessEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired in case the upload process failed.
+ */
+export type UploadErrorEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired when we have the actual server response, and before the component
+ * analyses it. It's useful for developers to make the upload fail depending
+ * on the server response. If the event is defaultPrevented the vaadin-upload
+ * will return allowing the user to do something on his own like retry the
+ * upload, etc. since he has full access to the `xhr` and `file` objects.
+ * Otherwise, if the event is not prevented default `vaadin-upload` continues
+ * with the normal workflow checking the `xhr.status` and `file.error`
+ * which also might be modified by the user to force a customized response,
+ */
+export type UploadResponseEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired when retry upload is requested. If the default is prevented, then
+ * retry would not be performed.
+ */
+export type UploadRetryEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired when upload abort is requested. If the default is prevented, then the
+ * file upload would not be aborted.
+ */
+export type UploadAbortEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
+
+/**
+ * Fired when the XHR has been opened but not sent yet. Useful for appending
+ * data keys to the FormData object, for changing some parameters like
+ * headers, etc. If the event is defaultPrevented, `vaadin-upload` will not
+ * send the request allowing the user to do something on his own.
+ */
+export type UploadRequestEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile; formData: FormData }>;
+
+export interface UploadCustomEventMap {
+  'file-reject': UploadFileRejectEvent;
+
+  'files-changed': UploadFilesChangedEvent;
+
+  'max-files-reached-changed': UploadMaxFilesReachedChangedEvent;
+
+  'upload-before': UploadBeforeEvent;
+
+  'upload-start': UploadStartEvent;
+
+  'upload-progress': UploadProgressEvent;
+
+  'upload-response': UploadResponseEvent;
+
+  'upload-success': UploadSuccessEvent;
+
+  'upload-error': UploadErrorEvent;
+
+  'upload-retry': UploadRetryEvent;
+
+  'upload-abort': UploadAbortEvent;
+
+  'upload-request': UploadRequestEvent;
+}
+
+export interface UploadEventMap extends HTMLElementEventMap, UploadCustomEventMap {}
 
 /**
  * `<vaadin-upload>` is a Web Component for uploading multiple files with drag and drop support.
@@ -208,7 +371,7 @@ declare class Upload extends ThemableMixin(ElementMixin(HTMLElement)) {
    *   file: {
    *     retry: 'Retry',
    *     start: 'Start',
-   *     clear: 'Clear'
+   *     remove: 'Remove'
    *   },
    *   units: {
    *     size: ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],

package/src/vaadin-upload.js

@@ -369,7 +369,7 @@ class Upload extends ElementMixin(ThemableMixin(PolymerElement)) {
        *   file: {
        *     retry: 'Retry',
        *     start: 'Start',
-       *     clear: 'Clear'
+       *     remove: 'Remove'
        *   },
        *   units: {
        *     size: ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
@@ -424,7 +424,7 @@ class Upload extends ElementMixin(ThemableMixin(PolymerElement)) {
             file: {
               retry: 'Retry',
               start: 'Start',
-              clear: 'Clear'
+              remove: 'Remove'
             },
             units: {
               size: ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']

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

@@ -159,7 +159,7 @@ const uploadFile = css`
     content: var(--lumo-icons-reload);
   }
 
-  [part='clear-button']::before {
+  [part='remove-button']::before {
     content: var(--lumo-icons-cross);
   }
 

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

@@ -168,7 +168,7 @@ registerStyles(
       outline: none;
     }
 
-    [part='clear-button'] {
+    [part='remove-button'] {
       margin-right: -8px;
     }
 
@@ -194,7 +194,7 @@ registerStyles(
       content: var(--material-icons-reload);
     }
 
-    [part='clear-button']::before {
+    [part='remove-button']::before {
       content: var(--material-icons-clear);
     }
 

package/vaadin-upload.d.ts

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

package/src/interfaces.d.ts

@@ -1,160 +0,0 @@
-export interface UploadFile extends File {
-  uploadTarget: string;
-  elapsed: number;
-  elapsedStr: string;
-  remaining: number;
-  remainingStr: string;
-  progress: number;
-  speed: number;
-  totalStr: string;
-  loaded: number;
-  loadedStr: string;
-  status: string;
-  error: string;
-  abort?: boolean;
-  complete?: boolean;
-  uploading?: boolean;
-}
-
-export interface UploadI18n {
-  dropFiles: {
-    one: string;
-    many: string;
-  };
-  addFiles: {
-    one: string;
-    many: string;
-  };
-  error: {
-    tooManyFiles: string;
-    fileIsTooBig: string;
-    incorrectFileType: string;
-  };
-  uploading: {
-    status: {
-      connecting: string;
-      stalled: string;
-      processing: string;
-      held: string;
-    };
-    remainingTime: {
-      prefix: string;
-      unknown: string;
-    };
-    error: {
-      serverUnavailable: string;
-      unexpectedServerError: string;
-      forbidden: string;
-    };
-  };
-  units: {
-    size: string[];
-    sizeBase?: number;
-  };
-  formatSize?: (bytes: number) => string;
-  formatTime?: (seconds: number, units: number[]) => string;
-}
-
-export type UploadMethod = 'POST' | 'PUT';
-
-/**
- * Fired when a file cannot be added to the queue due to a constrain:
- * file-size, file-type or maxFiles
- */
-export type UploadFileRejectEvent = CustomEvent<{ file: UploadFile; error: string }>;
-
-/**
- * Fired when the `files` property changes.
- */
-export type UploadFilesChangedEvent = CustomEvent<{ value: UploadFile[] }>;
-
-/**
- * Fired when the `max-files-reached` property changes.
- */
-export type UploadMaxFilesReachedChangedEvent = CustomEvent<{ value: boolean }>;
-
-/**
- * Fired before the XHR is opened. Could be used for changing the request
- * URL. If the default is prevented, then XHR would not be opened.
- */
-export type UploadBeforeEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired when the XHR is sent.
- */
-export type UploadStartEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired as many times as the progress is updated.
- */
-export type UploadProgressEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired in case the upload process succeeded.
- */
-export type UploadSuccessEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired in case the upload process failed.
- */
-export type UploadErrorEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired when we have the actual server response, and before the component
- * analyses it. It's useful for developers to make the upload fail depending
- * on the server response. If the event is defaultPrevented the vaadin-upload
- * will return allowing the user to do something on his own like retry the
- * upload, etc. since he has full access to the `xhr` and `file` objects.
- * Otherwise, if the event is not prevented default `vaadin-upload` continues
- * with the normal workflow checking the `xhr.status` and `file.error`
- * which also might be modified by the user to force a customized response,
- */
-export type UploadResponseEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired when retry upload is requested. If the default is prevented, then
- * retry would not be performed.
- */
-export type UploadRetryEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired when upload abort is requested. If the default is prevented, then the
- * file upload would not be aborted.
- */
-export type UploadAbortEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile }>;
-
-/**
- * Fired when the XHR has been opened but not sent yet. Useful for appending
- * data keys to the FormData object, for changing some parameters like
- * headers, etc. If the event is defaultPrevented, `vaadin-upload` will not
- * send the request allowing the user to do something on his own.
- */
-export type UploadRequestEvent = CustomEvent<{ xhr: XMLHttpRequest; file: UploadFile; formData: FormData }>;
-
-export interface UploadCustomEventMap {
-  'file-reject': UploadFileRejectEvent;
-
-  'files-changed': UploadFilesChangedEvent;
-
-  'max-files-reached-changed': UploadMaxFilesReachedChangedEvent;
-
-  'upload-before': UploadBeforeEvent;
-
-  'upload-start': UploadStartEvent;
-
-  'upload-progress': UploadProgressEvent;
-
-  'upload-response': UploadResponseEvent;
-
-  'upload-success': UploadSuccessEvent;
-
-  'upload-error': UploadErrorEvent;
-
-  'upload-retry': UploadRetryEvent;
-
-  'upload-abort': UploadAbortEvent;
-
-  'upload-request': UploadRequestEvent;
-}
-
-export interface UploadEventMap extends HTMLElementEventMap, UploadCustomEventMap {}