@uploadcare/file-uploader 1.22.0 → 1.23.1

package/abstract/uploadEntrySchema.js

@@ -100,7 +100,7 @@ export const uploadEntrySchema = Object.freeze({
   }),
   errors: Object.freeze({
     type: Array,
-    value: /** @type {Error[]} */ ([]),
+    value: /** @type {import('../types').OutputErrorFile[]} */ ([]),
   }),
   uploadError: Object.freeze({
     type: Error,
@@ -111,7 +111,15 @@ export const uploadEntrySchema = Object.freeze({
     type: Boolean,
     value: false,
   }),
-  isQueued: Object.freeze({
+  isQueuedForUploading: Object.freeze({
+    type: Boolean,
+    value: false,
+  }),
+  isValidationPending: Object.freeze({
+    type: Boolean,
+    value: false,
+  }),
+  isQueuedForValidation: Object.freeze({
     type: Boolean,
     value: false,
   }),

package/blocks/CloudImageEditor/src/CloudImageEditorBlock.js

@@ -55,9 +55,9 @@ export class CloudImageEditorBlock extends Block {
       }, TIMEOUT);
       const resizeObserver = new ResizeObserver(([element]) => {
         if (element.contentRect.width > 0 && element.contentRect.height > 0) {
-          resolve();
           clearTimeout(timeoutId);
           resizeObserver.disconnect();
+          setTimeout(() => resolve(), 0);
         }
       });
       resizeObserver.observe(this);

package/blocks/Config/initialConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AACvE,+CAAgD,qBAAqB,CAAC;AAEtE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CAgFjD"}
+{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AACvE,+CAAgD,qBAAqB,CAAC;AAEtE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CAkFjD"}

package/blocks/Config/initialConfig.js

@@ -71,6 +71,8 @@ export const initialConfig = Object.freeze({
   iconHrefResolver: null,
   fileValidators: [],
   collectionValidators: [],
+  validationTimeout: 15 * 1000,
+  validationConcurrency: 100,
 
   cameraModes: 'photo, video',
   defaultCameraMode: null,

package/blocks/Config/normalizeConfigValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeConfigValue.d.ts","sourceRoot":"","sources":["normalizeConfigValue.js"],"names":[],"mappings":"AAmHO,qCAL+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,OAC1C,CAAC,SACD,OAAO,GACL,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAa3D"}
+{"version":3,"file":"normalizeConfigValue.d.ts","sourceRoot":"","sources":["normalizeConfigValue.js"],"names":[],"mappings":"AAqHO,qCAL+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,OAC1C,CAAC,SACD,OAAO,GACL,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAa3D"}

package/blocks/Config/normalizeConfigValue.js

@@ -88,6 +88,8 @@ const mapping = {
   iconHrefResolver: /** @type {typeof asFunction<import('../../types').IconHrefResolver>} */ (asFunction),
   fileValidators: /** @type {typeof asArray<import('../../types').FileValidators>} */ (asArray),
   collectionValidators: /** @type {typeof asArray<import('../../types').CollectionValidators>} */ (asArray),
+  validationTimeout: asNumber,
+  validationConcurrency: asNumber,
 
   cameraModes: asCameraModes,
   defaultCameraMode: asCameraMode,

package/blocks/ExternalSource/ExternalSource.d.ts

@@ -12,6 +12,7 @@ export class ExternalSource extends UploaderBlock {
         couldSelectAll: boolean;
         couldDeselectAll: boolean;
         showSelectionStatus: boolean;
+        showDoneBtn: boolean;
         counterText: string;
         doneBtnTextClass: string;
         toolbarVisible: boolean;

package/blocks/ExternalSource/ExternalSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalSource.d.ts","sourceRoot":"","sources":["ExternalSource.js"],"names":[],"mappings":"AAkBA,+DAA+D;AAE/D;IAEE,yBAAiD;IAK/C;;;QAKE,6FAA6F;sBAAlF,OAAO,YAAY,EAAE,eAAe,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;MAmC1F;IAGH,6BAA6B;IAC7B,sBADW,cAAc,CAOxB;IAgDD;;;OAGG;IACH,mCAcC;IAED;;;OAGG;IACH,iCAIC;IAED;;;OAGG;IACH,kCAsBC;IAED,eAAe;IACf,yBAIC;IAED,eAAe;IACf,mBAKC;IAED;;;OAGG;IACH,sBAKC;IAED,eAAe;IACf,kBAKC;IAED,eAAe;IACf,kBAkBC;IAED,eAAe;IACf,oBA8BC;IANC,eAAe;IACf,uBAA6D;IAO/D,eAAe;IACf,sBAMC;IAED,eAAe;IACf,6BASC;CACF;;;;6BAjRa;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE;8BAdd,iCAAiC"}
+{"version":3,"file":"ExternalSource.d.ts","sourceRoot":"","sources":["ExternalSource.js"],"names":[],"mappings":"AAkBA,+DAA+D;AAE/D;IAEE,yBAAiD;IAK/C;;;QAKE,6FAA6F;sBAAlF,OAAO,YAAY,EAAE,eAAe,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuC1F;IAGH,6BAA6B;IAC7B,sBADW,cAAc,CAOxB;IAgDD;;;OAGG;IACH,mCAcC;IAED;;;OAGG;IACH,iCAIC;IAED;;;OAGG;IACH,kCA0BC;IAED,eAAe;IACf,yBAIC;IAED,eAAe;IACf,mBAKC;IAED;;;OAGG;IACH,sBAKC;IAED,eAAe;IACf,kBAKC;IAED,eAAe;IACf,kBAkBC;IAED,eAAe;IACf,oBA6BC;IANC,eAAe;IACf,uBAA6D;IAO/D,eAAe;IACf,sBAMC;IAED,eAAe;IACf,6BAUC;CACF;;;;6BAzRa;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE;8BAdd,iCAAiC"}

package/blocks/ExternalSource/ExternalSource.js

@@ -3,13 +3,13 @@
 import { create } from '@symbiotejs/symbiote';
 import { ActivityBlock } from '../../abstract/ActivityBlock.js';
 import { UploaderBlock } from '../../abstract/UploaderBlock.js';
+import { getTopLevelOrigin } from '../../utils/get-top-level-origin.js';
 import { stringToArray } from '../../utils/stringToArray.js';
 import { wildcardRegexp } from '../../utils/wildcardRegexp.js';
+import { ExternalUploadSource } from '../utils/UploadSource.js';
 import { buildThemeDefinition } from './buildThemeDefinition.js';
 import { MessageBridge } from './MessageBridge.js';
 import { queryString } from './query-string.js';
-import { getTopLevelOrigin } from '../../utils/get-top-level-origin.js';
-import { ExternalUploadSource } from '../utils/UploadSource.js';
 
 /** @type {Record<string, string>} */
 const SOCIAL_SOURCE_MAPPING = {
@@ -39,6 +39,7 @@ export class ExternalSource extends UploaderBlock {
       couldSelectAll: false,
       couldDeselectAll: false,
       showSelectionStatus: false,
+      showDoneBtn: false,
       counterText: '',
       doneBtnTextClass: 'uc-hidden',
       toolbarVisible: true,
@@ -48,7 +49,10 @@ export class ExternalSource extends UploaderBlock {
           const url = this.extractUrlFromSelectedFile(message);
           const { filename } = message;
           const { externalSourceType } = this.activityParams;
-          this.api.addFileFromUrl(url, { fileName: filename, source: externalSourceType });
+          this.api.addFileFromUrl(url, {
+            fileName: filename,
+            source: externalSourceType,
+          });
         }
 
         this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
@@ -81,7 +85,7 @@ export class ExternalSource extends UploaderBlock {
     super.initCallback();
     this.registerActivity(this.activityType, {
       onActivate: () => {
-        let { externalSourceType } = /** @type {ActivityParams} */ (this.activityParams);
+        const { externalSourceType } = /** @type {ActivityParams} */ (this.activityParams);
 
         if (!externalSourceType) {
           this.modalManager.close(this.$['*currentActivity']);
@@ -179,6 +183,10 @@ export class ExternalSource extends UploaderBlock {
       couldDeselectAll: message.selectedCount === message.total,
       selectedList: message.selectedFiles,
     });
+
+    if (!this.$.showDoneBtn && message.isReady) {
+      this.$.showDoneBtn = true;
+    }
   }
 
   /** @private */
@@ -239,8 +247,7 @@ export class ExternalSource extends UploaderBlock {
   /** @private */
   mountIframe() {
     /** @type {HTMLIFrameElement} */
-    // @ts-ignore
-    let iframe = create({
+    const iframe = create({
       tag: 'iframe',
       attributes: {
         src: this.remoteUrl(),
@@ -287,6 +294,7 @@ export class ExternalSource extends UploaderBlock {
       couldSelectAll: false,
       couldDeselectAll: false,
       showSelectionStatus: false,
+      showDoneBtn: false,
     });
   }
 }
@@ -311,7 +319,11 @@ ExternalSource.template = /* HTML */ `
         <button type="button" set="onclick: onSelectAll; @hidden: !couldSelectAll" l10n="select-all"></button>
         <button type="button" set="onclick: onDeselectAll; @hidden: !couldDeselectAll" l10n="deselect-all"></button>
       </div>
-      <button type="button" class="uc-done-btn uc-primary-btn" set="onclick: onDone; @disabled: !isDoneBtnEnabled;">
+      <button
+        type="button"
+        class="uc-done-btn uc-primary-btn"
+        set="onclick: onDone; @disabled: !isDoneBtnEnabled; @hidden: !showDoneBtn"
+      >
         <uc-spinner set="@hidden: isSelectionReady"></uc-spinner>
         <span l10n="done" set="@class: doneBtnTextClass"></span>
       </button>

package/blocks/FileItem/FileItem.d.ts

@@ -46,7 +46,7 @@ export class FileItem extends FileItemConfig {
     private _calculateState;
     /** @private */
     private _debouncedCalculateState;
-    _updateHint: (...args: any[]) => void;
+    _updateHintAndProgress: (...args: any[]) => void;
     /**
      * @private
      * @param {String} id

package/blocks/FileItem/FileItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileItem.d.ts","sourceRoot":"","sources":["FileItem.js"],"names":[],"mappings":"AAiBA;IAIE,eAAe;IACf,sBAAsB;IAKpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+CC;IAQH;;;OAGG;IACH,0BAUC;IAPC,qCAA2C;IAC3C,wCAA0C;IAQ5C,eAAe;IACf,wBAYG;IAEH,eAAe;IACf,iCAA0E;IAE1E,sCA4BE;IAEF;;;OAGG;IACH,uBAqCC;IAED,6BAA6B;IAC7B,4BADY,OAAO,QASlB;IAgDD,uCA+BE;IAaA,eAAe;IACf,kBAEE;IAUJ;;;MAEC;IAED;;;OAGG;IACH,uBAEC;IAED,0CAyGG;CACJ;;;;;+BA7Z8B,qBAAqB"}
+{"version":3,"file":"FileItem.d.ts","sourceRoot":"","sources":["FileItem.js"],"names":[],"mappings":"AAoBA;IAIE,eAAe;IACf,sBAAsB;IAKpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+CC;IAQH;;;OAGG;IACH,0BAUC;IAPC,qCAA2C;IAC3C,wCAA0C;IAQ5C,eAAe;IACf,wBAkBG;IAEH,eAAe;IACf,iCAA0E;IAE1E,iDAmCE;IAEF;;;OAGG;IACH,uBA4CC;IAED,6BAA6B;IAC7B,4BADY,OAAO,QASlB;IAgDD,uCAsBE;IAaA,eAAe;IACf,kBAEE;IAUJ;;;MAEC;IAED;;;OAGG;IACH,uBAEC;IAED,0CA8GG;CACJ;;;;;+BAhb8B,qBAAqB"}

package/blocks/FileItem/FileItem.js

@@ -12,6 +12,9 @@ const FileItemState = Object.freeze({
   FINISHED: Symbol('FINISHED'),
   FAILED: Symbol('FAILED'),
   UPLOADING: Symbol('UPLOADING'),
+  VALIDATION: Symbol('VALIDATION'),
+  QUEUED_UPLOADING: Symbol('QUEUED-UPLOADING'),
+  QUEUED_VALIDATION: Symbol('QUEUED-VALIDATION'),
   IDLE: Symbol('IDLE'),
 });
 
@@ -102,6 +105,12 @@ export class FileItem extends FileItemConfig {
 
     if (entry.getValue('errors').length > 0) {
       state = FileItemState.FAILED;
+    } else if (entry.getValue('isQueuedForUploading')) {
+      state = FileItemState.QUEUED_UPLOADING;
+    } else if (entry.getValue('isQueuedForValidation')) {
+      state = FileItemState.QUEUED_VALIDATION;
+    } else if (entry.getValue('isValidationPending')) {
+      state = FileItemState.VALIDATION;
     } else if (entry.getValue('isUploading')) {
       state = FileItemState.UPLOADING;
     } else if (entry.getValue('fileInfo')) {
@@ -114,34 +123,41 @@ export class FileItem extends FileItemConfig {
   /** @private */
   _debouncedCalculateState = debounce(this._calculateState.bind(this), 100);
 
-  _updateHint = this._withEntry(
-    throttle((entry) => {
-      const source = entry.getValue('source');
-      const externalUrl = entry.getValue('externalUrl');
-      const noErrors = entry.getValue('errors').length === 0;
-      const noProgress = this.$.progressValue === 0;
-      const isUploading = this.$.state === FileItemState.UPLOADING;
-      const isQueued = entry.getValue('isQueued');
-
-      if (!noErrors || !isUploading || !noProgress) {
-        this.$.hint = '';
-        return;
-      }
-
-      if (isQueued) {
-        const hint = this.l10n('queued');
-        this.$.hint = hint;
-        return;
-      }
-
-      if (externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
-        const hint = this.l10n('waiting-for', { source: this.l10n(`src-type-${source}`) });
-        this.$.hint = hint;
-        return;
-      }
+  _updateHintAndProgress = this._withEntry(
+    throttle(
+      /** @param {(typeof FileItemState)[keyof typeof FileItemState]} state */
+      (entry, state) => {
+        const errorText = entry.getValue('errors')?.[0]?.message;
+        const source = entry.getValue('source');
+        const externalUrl = entry.getValue('externalUrl');
+        const isUploading = state === FileItemState.UPLOADING;
+        const isQueuedForUploading = state === FileItemState.QUEUED_UPLOADING;
+        const isQueuedForValidation = state === FileItemState.QUEUED_VALIDATION;
+        const isValidationPending = state === FileItemState.VALIDATION;
+        const fileName = entry.getValue('fileName');
+        let hint = '';
+
+        if (errorText) {
+          hint = '';
+        } else if (externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
+          hint = this.l10n('waiting-for', { source: this.l10n(`src-type-${source}`) });
+        }
 
-      this.$.hint = '';
-    }, 100),
+        this.set$({
+          hint,
+          errorText: errorText,
+          progressVisible: isUploading || isQueuedForUploading || isQueuedForValidation || isValidationPending,
+          progressValue: isQueuedForValidation || isValidationPending ? 0 : entry.getValue('uploadProgress'),
+          ariaLabelStatusFile:
+            fileName &&
+            this.l10n('a11y-file-item-status', {
+              fileName,
+              status: this.l10n(state?.description?.toLocaleLowerCase() ?? '').toLocaleLowerCase(),
+            }),
+        });
+      },
+      100,
+    ),
   );
 
   /**
@@ -158,13 +174,20 @@ export class FileItem extends FileItemConfig {
       return;
     }
 
-    this._subEntry('uploadProgress', (uploadProgress) => {
-      this.$.progressValue = uploadProgress;
-      this._updateHint();
+    this._subEntry('isQueuedForValidation', () => {
+      this._debouncedCalculateState();
     });
 
-    this._subEntry('isQueued', () => {
-      this._updateHint();
+    this._subEntry('isValidationPending', () => {
+      this._debouncedCalculateState();
+    });
+
+    this._subEntry('uploadProgress', () => {
+      this._debouncedCalculateState();
+    });
+
+    this._subEntry('isQueuedForUploading', () => {
+      this._debouncedCalculateState();
     });
 
     this._subEntry('fileName', (name) => {
@@ -256,24 +279,15 @@ export class FileItem extends FileItemConfig {
       if (state === FileItemState.UPLOADING) {
         this.$.isFocused = false;
       }
-      const fileName = entry.getValue('fileName');
 
       this.set$({
         isFailed: state === FileItemState.FAILED,
         isUploading: state === FileItemState.UPLOADING,
         isFinished: state === FileItemState.FINISHED,
-        progressVisible: state === FileItemState.UPLOADING,
-        isEditable: this.cfg.useCloudImageEditor && this._entry?.getValue('isImage') && this._entry?.getValue('cdnUrl'),
-        errorText: entry.getValue('errors')?.[0]?.message,
-        ariaLabelStatusFile:
-          fileName &&
-          this.l10n('a11y-file-item-status', {
-            fileName,
-            status: this.l10n(state?.description?.toLocaleLowerCase() ?? '').toLocaleLowerCase(),
-          }),
+        isEditable: this.cfg.useCloudImageEditor && entry.getValue('isImage') && entry.getValue('cdnUrl'),
       });
 
-      this._updateHint();
+      this._updateHintAndProgress(state);
     },
   );
 
@@ -318,7 +332,12 @@ export class FileItem extends FileItemConfig {
       return;
     }
 
-    if (entry.getValue('fileInfo') || entry.getValue('isUploading') || entry.getValue('errors').length > 0) {
+    if (
+      entry.getValue('fileInfo') ||
+      entry.getValue('isUploading') ||
+      entry.getValue('errors').length > 0 ||
+      entry.getValue('isValidationPending')
+    ) {
       return;
     }
     const multipleMax = this.cfg.multiple ? this.cfg.multipleMax : 1;
@@ -326,20 +345,20 @@ export class FileItem extends FileItemConfig {
       return;
     }
 
-    this._debouncedCalculateState();
-
     entry.setMultipleValues({
       isUploading: true,
       errors: [],
-      isQueued: true,
+      isQueuedForUploading: true,
     });
 
+    this._debouncedCalculateState();
+
     try {
       let abortController = new AbortController();
       entry.setValue('abortController', abortController);
 
       const uploadTask = async () => {
-        entry.setValue('isQueued', false);
+        entry.setValue('isQueuedForUploading', false);
         /** @type {Blob | File | null} */
         let file = entry.getValue('file');
         if (file && this.cfg.imageShrink) {
@@ -373,7 +392,7 @@ export class FileItem extends FileItemConfig {
       let fileInfo = await this.$['*uploadQueue'].add(uploadTask);
       entry.setMultipleValues({
         fileInfo,
-        isQueued: false,
+        isQueuedForUploading: false,
         isUploading: false,
         fileName: fileInfo.originalFilename,
         fileSize: fileInfo.size,

package/blocks/UploadList/UploadList.d.ts

@@ -5,6 +5,7 @@
  *   succeed: number;
  *   uploading: number;
  *   failed: number;
+ *   validatingBeforeUploading: number;
  * }} Summary
  */
 export class UploadList extends UploaderBlock {
@@ -55,6 +56,7 @@ export type Summary = {
     succeed: number;
     uploading: number;
     failed: number;
+    validatingBeforeUploading: number;
 };
 import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 //# sourceMappingURL=UploadList.d.ts.map

package/blocks/UploadList/UploadList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadList.d.ts","sourceRoot":"","sources":["UploadList.js"],"names":[],"mappings":"AAMA,+CAA+C;AAE/C;;;;;;;GAOG;AAEH;IAKE,4BAAoD;IAKlD;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BC;IAGH,eAAe;IACf,yCASQ;IAER,eAAe;IACf,4BAuCC;IAED;;;OAGG;IACH,uBAmBC;CAwEF;;;;4BAvMa,MAAM,GAAG,MAAM;sBAGhB;IACR,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;8BAZ0B,iCAAiC"}
+{"version":3,"file":"UploadList.d.ts","sourceRoot":"","sources":["UploadList.js"],"names":[],"mappings":"AAMA,+CAA+C;AAE/C;;;;;;;;GAQG;AAEH;IAKE,4BAAoD;IAKlD;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BC;IAGH,eAAe;IACf,yCAaQ;IAER,eAAe;IACf,4BA2CC;IAED;;;OAGG;IACH,uBAsBC;CA0DF;;;;4BArMa,MAAM,GAAG,MAAM;sBAGhB;IACR,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,yBAAyB,EAAE,MAAM,CAAC;CACnC;8BAb0B,iCAAiC"}

package/blocks/UploadList/UploadList.js

@@ -12,6 +12,7 @@ import { throttle } from '../utils/throttle.js';
  *   succeed: number;
  *   uploading: number;
  *   failed: number;
+ *   validatingBeforeUploading: number;
  * }} Summary
  */
 
@@ -64,6 +65,10 @@ export class UploadList extends UploaderBlock {
     if (!this.couldOpenActivity && this.$['*currentActivity'] === this.activityType) {
       this.historyBack();
     }
+
+    if (!this.cfg.confirmUpload) {
+      this.api.uploadAll();
+    }
   }, 300);
 
   /** @private */
@@ -75,19 +80,21 @@ export class UploadList extends UploaderBlock {
       succeed: collectionState.successCount,
       uploading: collectionState.uploadingCount,
       failed: collectionState.failedCount,
+      validatingBeforeUploading: collectionState.idleEntries.filter((e) => e.isValidationPending).length,
     };
     const fitCountRestrictions = !collectionState.errors.some(
       (err) => err.type === 'TOO_MANY_FILES' || err.type === 'TOO_FEW_FILES',
     );
     const tooMany = collectionState.errors.some((err) => err.type === 'TOO_MANY_FILES');
     const exact = collectionState.totalCount === (this.cfg.multiple ? this.cfg.multipleMax : 1);
-    const validationOk = summary.failed === 0 && collectionState.errors.length === 0;
+    const isValidationPending = collectionState.allEntries.some((entry) => entry.isValidationPending);
+    const validationOk = summary.failed === 0 && collectionState.errors.length === 0 && !isValidationPending;
     let uploadBtnVisible = false;
     let allDone = false;
     let doneBtnEnabled = false;
 
     const readyToUpload = summary.total - summary.succeed - summary.uploading - summary.failed;
-    if (readyToUpload > 0 && fitCountRestrictions) {
+    if (readyToUpload > 0 && fitCountRestrictions && validationOk) {
       uploadBtnVisible = true;
     } else {
       allDone = true;
@@ -103,6 +110,8 @@ export class UploadList extends UploaderBlock {
 
       addMoreBtnEnabled: summary.total === 0 || (!tooMany && !exact),
       addMoreBtnVisible: !exact || this.cfg.multiple,
+
+      hasFiles: summary.total > 0,
     });
 
     this.bindL10n('headerText', () => this._getHeaderText(summary));
@@ -115,12 +124,15 @@ export class UploadList extends UploaderBlock {
   _getHeaderText(summary) {
     /** @param {keyof Summary} status */
     const localizedText = (status) => {
-      const count = summary[status];
+      let count = summary[status];
+      if (status === 'uploading') {
+        count += summary.validatingBeforeUploading;
+      }
       return this.l10n(`header-${status}`, {
         count: count,
       });
     };
-    if (summary.uploading > 0) {
+    if (summary.uploading > 0 || summary.validatingBeforeUploading > 0) {
       return localizedText('uploading');
     }
     if (summary.failed > 0) {
@@ -164,22 +176,7 @@ export class UploadList extends UploaderBlock {
     // TODO: could be performance issue on many files
     // there is no need to update buttons state on every progress tick
     this.uploadCollection.observeProperties(this._throttledHandleCollectionUpdate);
-
-    this.sub(
-      '*uploadList',
-      (list) => {
-        this._throttledHandleCollectionUpdate();
-
-        this.set$({
-          hasFiles: list.length > 0,
-        });
-
-        if (!this.cfg.confirmUpload) {
-          this.api.uploadAll();
-        }
-      },
-      false,
-    );
+    this.uploadCollection.observeCollection(this._throttledHandleCollectionUpdate);
 
     this.sub(
       '*collectionErrors',
@@ -202,6 +199,7 @@ export class UploadList extends UploaderBlock {
   destroyCallback() {
     super.destroyCallback();
     this.uploadCollection.unobserveProperties(this._throttledHandleCollectionUpdate);
+    this.uploadCollection.unobserveCollection(this._throttledHandleCollectionUpdate);
   }
 }
 

package/env.d.ts

@@ -1,4 +1,4 @@
 /** Do not edit this file manually. It's generated during build process. */
 export const PACKAGE_NAME: "blocks";
-export const PACKAGE_VERSION: "1.22.0";
+export const PACKAGE_VERSION: "1.23.1";
 //# sourceMappingURL=env.d.ts.map

package/env.js

@@ -1,3 +1,3 @@
 /** Do not edit this file manually. It's generated during build process. */
 export const PACKAGE_NAME = 'blocks';
-export const PACKAGE_VERSION = '1.22.0';
+export const PACKAGE_VERSION = '1.23.1';

package/index.ssr.d.ts

@@ -566,7 +566,7 @@ export namespace ModalEvents {
     let DESTROY: string;
 }
 export const PACKAGE_NAME: "blocks";
-export const PACKAGE_VERSION: "1.22.0";
+export const PACKAGE_VERSION: "1.23.1";
 export const PresenceToggle: {
     new (): {};
     template: string;

package/index.ssr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.ssr.d.ts","sourceRoot":"","sources":["index.ssr.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;EAcE;AACF;;;;;;;;;;;;;;;EAcE;AACF;;;;;EAIE;AACF;;;;;;EAKE;AACF;;;;;;;;EAgBE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6IE;AACF;;;;;;;;EAuCE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAuCE;AACF;;;;;;;EAwHE;AACF;;;;;;;EAaE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EASE;AACF;;;;;;EAKE;AACF;;;;;;;EAWE;AACF;;;;;;;EAME;AACF;;;;;;;EAWE;AACF;;;;;;;EA+IE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0EE;;;;;;;;;;;;;AAaF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqFE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAWE;AACF;;;;;;EAwBE;AACF;;;;;;;EAUE;AACF;;;;;;;;EAWE;;;;;;;;;AASF,oCAAqC;AACrC,uCAAwC;AACxC;;;;;;;EAME;AACF;;;;;;;EASE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgDE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0DE;AACF;;;;;;;EAeE;AACF;;;;;;EAKE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsDE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuDE;AACF;;;;;;;;;;;;EAWE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqEE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuGE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6EE;AACK,yCAAiC;AACjC,qCAA6B;AAC7B,6CAAqC;AACrC,oCAA4B"}
+{"version":3,"file":"index.ssr.d.ts","sourceRoot":"","sources":["index.ssr.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;EAcE;AACF;;;;;;;;;;;;;;;EAcE;AACF;;;;;EAIE;AACF;;;;;;EAKE;AACF;;;;;;;;EAgBE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6IE;AACF;;;;;;;;EAuCE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAuCE;AACF;;;;;;;EA4HE;AACF;;;;;;;EAaE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EASE;AACF;;;;;;EAKE;AACF;;;;;;;EAWE;AACF;;;;;;;EAME;AACF;;;;;;;EAWE;AACF;;;;;;;EA+IE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EE;;;;;;;;;;;;;AAaF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqFE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAWE;AACF;;;;;;EAwBE;AACF;;;;;;;EAUE;AACF;;;;;;;;EAWE;;;;;;;;;AASF,oCAAqC;AACrC,uCAAwC;AACxC;;;;;;;EAME;AACF;;;;;;;EASE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgDE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0DE;AACF;;;;;;;EAeE;AACF;;;;;;EAKE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsDE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuDE;AACF;;;;;;;;;;;;EAWE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqEE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuGE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6EE;AACK,yCAAiC;AACjC,qCAA6B;AAC7B,6CAAqC;AACrC,oCAA4B"}

package/index.ssr.js

@@ -376,6 +376,8 @@ export const Config = class {
     "user-agent-integration",
     "locale-name",
     "secure-uploads-expire-threshold",
+    "validation-timeout",
+    "validation-concurrency",
     "camera-modes",
     "default-camera-mode",
     "enable-audio-recording",
@@ -430,6 +432,8 @@ export const Config = class {
     "useragentintegration",
     "localename",
     "secureuploadsexpirethreshold",
+    "validationtimeout",
+    "validationconcurrency",
     "cameramodes",
     "defaultcameramode",
     "enableaudiorecording",
@@ -812,7 +816,11 @@ export const ExternalSource = class {
         <button type="button" set="onclick: onSelectAll; @hidden: !couldSelectAll" l10n="select-all"></button>
         <button type="button" set="onclick: onDeselectAll; @hidden: !couldDeselectAll" l10n="deselect-all"></button>
       </div>
-      <button type="button" class="uc-done-btn uc-primary-btn" set="onclick: onDone; @disabled: !isDoneBtnEnabled;">
+      <button
+        type="button"
+        class="uc-done-btn uc-primary-btn"
+        set="onclick: onDone; @disabled: !isDoneBtnEnabled; @hidden: !showDoneBtn"
+      >
         <uc-spinner set="@hidden: isSelectionReady"></uc-spinner>
         <span l10n="done" set="@class: doneBtnTextClass"></span>
       </button>
@@ -1100,7 +1108,7 @@ export const ModalEvents = {
   DESTROY: "modal:destroy",
 };
 export const PACKAGE_NAME = `blocks`;
-export const PACKAGE_VERSION = `1.22.0`;
+export const PACKAGE_VERSION = `1.23.1`;
 export const PresenceToggle = class {
   static template = `<slot></slot> `;
   static reg = () => {};

package/locales/file-uploader/ar.d.ts

@@ -126,9 +126,11 @@ declare const _default: {
     failed: string;
     uploading: string;
     idle: string;
-    queued: string;
     'a11y-file-item-status': string;
     'waiting-for': string;
+    'queued-uploading': string;
+    'queued-validation': string;
+    validation: string;
     'a11y-cloud-editor-apply-aspect-ratio': string;
     'crop-to-shape': string;
     custom: string;

package/locales/file-uploader/ar.js

@@ -63,7 +63,7 @@ export default {
   'src-type-vk': 'VK',
   'src-type-evernote': 'Evernote',
   'src-type-box': 'Box',
-  'src-type-onedrive': 'Onedrive',
+  'src-type-onedrive': 'OneDrive',
   'src-type-huddle': 'Huddle',
   'src-type-other': 'أخرى',
   'src-type-mobile-video-camera': 'فيديو',
@@ -127,9 +127,11 @@ export default {
   failed: 'فشل',
   uploading: 'جارٍ التحميل',
   idle: 'خامل',
-  queued: 'في الانتظار',
   'a11y-file-item-status': 'الملف {{fileName}} في حالة {{status}}',
   'waiting-for': 'في انتظار {{source}}',
+  'queued-uploading': 'في انتظار الرفع',
+  'queued-validation': 'في انتظار التحقق',
+  validation: 'جارٍ التحقق',
   'a11y-cloud-editor-apply-aspect-ratio': 'تطبيق عملية {{name}} {{value}}',
   'crop-to-shape': 'اقتصاص إلى {{value}}',
   custom: 'حر الشكل',

package/locales/file-uploader/az.d.ts

@@ -118,9 +118,11 @@ declare const _default: {
     failed: string;
     uploading: string;
     idle: string;
-    queued: string;
     'a11y-file-item-status': string;
     'waiting-for': string;
+    'queued-uploading': string;
+    'queued-validation': string;
+    validation: string;
     'a11y-cloud-editor-apply-aspect-ratio': string;
     'crop-to-shape': string;
     custom: string;

package/locales/file-uploader/az.js

@@ -55,7 +55,7 @@ export default {
   'src-type-vk': 'VK',
   'src-type-evernote': 'Evernote',
   'src-type-box': 'Box',
-  'src-type-onedrive': 'Onedrive',
+  'src-type-onedrive': 'OneDrive',
   'src-type-huddle': 'Huddle',
   'src-type-other': 'Digər',
   'src-type-mobile-video-camera': 'Video',
@@ -119,9 +119,12 @@ export default {
   failed: 'Uğursuz',
   uploading: 'Yüklənir',
   idle: 'Boş',
-  queued: 'Növbədə',
+
   'a11y-file-item-status': '{{fileName}} faylı {{status}} statusundadır',
   'waiting-for': '{{source}} gözlənilir',
+  'queued-uploading': 'Yükləmə üçün növbədə',
+  'queued-validation': 'Doğrulama üçün növbədə',
+  validation: 'Doğrulanır',
   'a11y-cloud-editor-apply-aspect-ratio': '{{name}} {{value}} əməliyyatını tətbiq et',
   'crop-to-shape': '{{value}} ölçüsünə kəs',