@uploadcare/file-uploader 1.15.0-alpha.3 → 1.15.0-alpha.5

package/blocks/Thumb/Thumb.js

@@ -0,0 +1,45 @@
+//@ts-check
+
+import { UploaderBlock } from '../../abstract/UploaderBlock.js';
+
+export class Thumb extends UploaderBlock {
+  constructor() {
+    super();
+
+    this.init$ = {
+      ...this.init$,
+      thumbUrl: '',
+      badgeIcon: '',
+    };
+  }
+
+  initCallback() {
+    super.initCallback();
+
+    this.defineAccessor('thumbUrl', (/** @type {string} */ val) => (this.$.thumbUrl = val));
+    this.defineAccessor('badgeIcon', (/** @type {string} */ val) => (this.$.badgeIcon = val));
+
+    this.setAttribute('role', 'img');
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+  }
+}
+
+Thumb.template = /* html */ `
+  <slot>
+    <div class="uc-thumb" set="style.backgroundImage: thumbUrl">
+      <div class="uc-badge">
+        <uc-icon set="@name: badgeIcon"></uc-icon>
+      </div>
+    </div>
+  </slot>
+`;
+
+Thumb.bindAttributes({
+  // @ts-expect-error TODO: fix types inside symbiote
+  thumbUrl: null,
+  // @ts-expect-error TODO: fix types inside symbiote
+  badgeIcon: null,
+});

package/blocks/Thumb/thumb.css

@@ -0,0 +1,4 @@
+uc-thumb {
+  width: 100%;
+  height: 100%;
+}

package/blocks/UploadList/UploadList.d.ts

@@ -1,3 +1,4 @@
+/** @typedef {'grid' | 'list'} FilesViewMode */
 /**
  * @typedef {{
  *   total: number;
@@ -48,6 +49,7 @@ export class UploadList extends UploaderBlock {
 export namespace UploadList {
     let template: string;
 }
+export type FilesViewMode = 'grid' | 'list';
 export type Summary = {
     total: number;
     succeed: number;

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

@@ -1 +1 @@
-{"version":3,"file":"UploadList.d.ts","sourceRoot":"","sources":["UploadList.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AAEH;IAKE,4BAAoD;IAKlD;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BC;IAGH,eAAe;IACf,yCASQ;IAER,eAAe;IACf,4BAuCC;IAED;;;OAGG;IACH,uBAmBC;CAwEF;;;;sBApMY;IACZ,KAAS,EAAE,MAAM,CAAC;IAClB,OAAW,EAAE,MAAM,CAAC;IACpB,SAAa,EAAE,MAAM,CAAC;IACtB,MAAU,EAAE,MAAM,CAAC;CAChB;8BAV0B,iCAAiC"}
+{"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;IACZ,KAAS,EAAE,MAAM,CAAC;IAClB,OAAW,EAAE,MAAM,CAAC;IACpB,SAAa,EAAE,MAAM,CAAC;IACtB,MAAU,EAAE,MAAM,CAAC;CAChB;8BAZ0B,iCAAiC"}

package/blocks/UploadList/UploadList.js

@@ -4,6 +4,8 @@ import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 import { EventType } from '../UploadCtxProvider/EventEmitter.js';
 import { throttle } from '../utils/throttle.js';
 
+/** @typedef {'grid' | 'list'} FilesViewMode */
+
 /**
  * @typedef {{
  *   total: number;
@@ -149,7 +151,7 @@ export class UploadList extends UploaderBlock {
       }
     });
 
-    this.subConfigValue('displayUploadList', (mode) => {
+    this.subConfigValue('filesViewMode', (mode) => {
       this.setAttribute('mode', mode);
     });
 

package/blocks/themes/uc-basic/common.css

@@ -13,7 +13,7 @@
   display: none !important;
 }
 
-:where([uc-wgt-common]) [activity]:not([active]) {
+:where([uc-wgt-common]) [activity]:not([active], .active) {
   display: none;
 }
 

package/blocks/themes/uc-basic/index.css

@@ -31,6 +31,7 @@
 @import url('../../CloudImageEditorActivity/index.css');
 @import url('../../Select/select.css');
 @import url('../../Spinner/spinner.css');
+@import url('../../Thumb/thumb.css');
 
 /* POST RESET */
 @import url('post-reset.css');

package/index.d.ts

@@ -28,6 +28,7 @@ export { ActivityHeader } from "./blocks/ActivityHeader/ActivityHeader.js";
 export { Select } from "./blocks/Select/Select.js";
 export { Copyright } from "./blocks/Copyright/Copyright.js";
 export { Spinner } from "./blocks/Spinner/Spinner.js";
+export { Thumb } from "./blocks/Thumb/Thumb.js";
 export { FileUploaderRegular } from "./solutions/file-uploader/regular/FileUploaderRegular.js";
 export { FileUploaderMinimal } from "./solutions/file-uploader/minimal/FileUploaderMinimal.js";
 export { FileUploaderInline } from "./solutions/file-uploader/inline/FileUploaderInline.js";

package/index.js

@@ -33,6 +33,7 @@ export { ActivityHeader } from './blocks/ActivityHeader/ActivityHeader.js';
 export { Select } from './blocks/Select/Select.js';
 export { Copyright } from './blocks/Copyright/Copyright.js';
 export { Spinner } from './blocks/Spinner/Spinner.js';
+export { Thumb } from './blocks/Thumb/Thumb.js';
 
 // Solutions:
 export { FileUploaderRegular } from './solutions/file-uploader/regular/FileUploaderRegular.js';

package/index.ssr.d.ts

@@ -765,6 +765,57 @@ export const StartFrom: {
     is: string;
     bindAttributes: () => void;
 };
+export const Thumb: {
+    new (): {};
+    template: string;
+    observedAttributes: string[];
+    extSrcList: {
+        FACEBOOK: string;
+        DROPBOX: string;
+        GDRIVE: string;
+        GPHOTOS: string;
+        FLICKR: string;
+        VK: string;
+        EVERNOTE: string;
+        BOX: string;
+        ONEDRIVE: string;
+        HUDDLE: string;
+    };
+    sourceTypes: {
+        LOCAL: string;
+        DROP_AREA: string;
+        CAMERA: string;
+        EXTERNAL: string;
+        API: string;
+        URL: string;
+        DRAW: string;
+        MOBILE_VIDEO_CAMERA: string;
+        MOBILE_PHOTO_CAMERA: string;
+        FACEBOOK: string;
+        DROPBOX: string;
+        GDRIVE: string;
+        GPHOTOS: string;
+        FLICKR: string;
+        VK: string;
+        EVERNOTE: string;
+        BOX: string;
+        ONEDRIVE: string;
+        HUDDLE: string;
+    };
+    activities: {
+        START_FROM: string;
+        CAMERA: string;
+        DRAW: string;
+        UPLOAD_LIST: string;
+        URL: string;
+        CLOUD_IMG_EDIT: string;
+        EXTERNAL: string;
+    };
+    reg: () => void;
+    styleAttrs: any[];
+    is: string;
+    bindAttributes: () => void;
+};
 export const UID: {
     new (): {};
     generate: () => void;

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4IE;AACF;;;;;;;;EAuCE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAuCE;AACF;;;;;;;EA4GE;AACF;;;;;;;EAaE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EASE;AACF;;;;;;EAKE;AACF;;;;;;;EAWE;AACF;;;;;;;EAME;AACF;;;;;;;EAWE;AACF;;;;;;;EA2IE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0EE;;;;;;;;;;;;;AAaF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoFE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAWE;AACF;;;;;;EAwBE;AACF;;;;;;;EAUE;AACF;;;;;;;;EAWE;AACF,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;;;;;;;;;;;;EAWE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuGE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2EE;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4IE;AACF;;;;;;;;EAuCE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAuCE;AACF;;;;;;;EA4GE;AACF;;;;;;;EAaE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;EAeE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEE;AACF;;;;;;;EAWE;AACF;;;;;;;EAWE;AACF;;;;;;;EASE;AACF;;;;;;EAKE;AACF;;;;;;;EAWE;AACF;;;;;;;EAME;AACF;;;;;;;EAWE;AACF;;;;;;;EA2IE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0EE;;;;;;;;;;;;;AAaF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqFE;AACF;;;;;;EAKE;AACF;;;;;;EAKE;AACF;;;;;;;EAME;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;EAWE;AACF;;;;;;EAwBE;AACF;;;;;;;EAUE;AACF;;;;;;;;EAWE;AACF,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyDE;AACF;;;;;;;;;;;;EAWE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuGE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2EE;AACK,yCAAiC;AACjC,qCAA6B;AAC7B,6CAAqC;AACrC,oCAA4B"}

package/index.ssr.js

@@ -377,9 +377,9 @@ export const Config = class {
     "enable-audio-recording",
     "enable-video-recording",
     "max-video-recording-duration",
-    "display-upload-list",
-    "enable-file-name",
-    "use-preview-image",
+    "files-view-mode",
+    "grid-show-file-names",
+    "cloud-image-editor-auto-open",
     "multiplemin",
     "multiplemax",
     "confirmupload",
@@ -425,9 +425,9 @@ export const Config = class {
     "enableaudiorecording",
     "enablevideorecording",
     "maxvideorecordingduration",
-    "displayuploadlist",
-    "enablefilename",
-    "usepreviewimage",
+    "filesviewmode",
+    "gridshowfilenames",
+    "cloudimageeditorautoopen",
   ];
   static reg = () => {};
   static styleAttrs = [];
@@ -491,6 +491,7 @@ export const DropArea = class {
     "text",
     "fullscreen",
     "disabled",
+    "initflow",
   ];
   static extSrcList = {
     FACEBOOK: "facebook",
@@ -839,11 +840,8 @@ export const ExternalUploadSource = {
 export const FileItem = class {
   static template = `
   <div class="uc-inner" set="@finished: isFinished; @uploading: isUploading; @failed: isFailed; @focused: isFocused">
-    <div class="uc-thumb" set="style.backgroundImage: thumbUrl">
-      <div class="uc-badge">
-        <uc-icon set="@name: badgeIcon"></uc-icon>
-      </div>
-    </div>
+    <uc-thumb set="thumbUrl:thumbUrl;badgeIcon:badgeIcon"></uc-thumb>
+
     <div aria-atomic="true" aria-live="polite" class="uc-file-name-wrapper" set="@aria-label:ariaLabelStatusFile;">
       <span class="uc-file-name" set="@hidden: isFileName">{{itemName}}</span>
       <span class="uc-file-error" set="@hidden: !errorText;">{{errorText}}</span>
@@ -870,7 +868,11 @@ export const FileItem = class {
         <uc-icon name="upload"></uc-icon>
       </button>
     </div>
-    <uc-progress-bar class="uc-progress-bar" set="value: progressValue; visible: progressVisible;"> </uc-progress-bar>
+    <uc-progress-bar
+      class="uc-progress-bar"
+      set="value: progressValue; visible: progressVisible; @hasFileName: !isFileName"
+    >
+    </uc-progress-bar>
   </div>
 `;
   static activeInstances = {};
@@ -1287,6 +1289,64 @@ export const StartFrom = class {
   static is = `sym-1`;
   static bindAttributes = () => {};
 };
+export const Thumb = class {
+  static template = `
+  <slot>
+    <div class="uc-thumb" set="style.backgroundImage: thumbUrl">
+      <div class="uc-badge">
+        <uc-icon set="@name: badgeIcon"></uc-icon>
+      </div>
+    </div>
+  </slot>
+`;
+  static observedAttributes = ["thumbUrl", "badgeIcon"];
+  static extSrcList = {
+    FACEBOOK: "facebook",
+    DROPBOX: "dropbox",
+    GDRIVE: "gdrive",
+    GPHOTOS: "gphotos",
+    FLICKR: "flickr",
+    VK: "vk",
+    EVERNOTE: "evernote",
+    BOX: "box",
+    ONEDRIVE: "onedrive",
+    HUDDLE: "huddle",
+  };
+  static sourceTypes = {
+    LOCAL: "local",
+    DROP_AREA: "drop-area",
+    CAMERA: "camera",
+    EXTERNAL: "external",
+    API: "js-api",
+    URL: "url",
+    DRAW: "draw",
+    MOBILE_VIDEO_CAMERA: "mobile-video-camera",
+    MOBILE_PHOTO_CAMERA: "mobile-photo-camera",
+    FACEBOOK: "facebook",
+    DROPBOX: "dropbox",
+    GDRIVE: "gdrive",
+    GPHOTOS: "gphotos",
+    FLICKR: "flickr",
+    VK: "vk",
+    EVERNOTE: "evernote",
+    BOX: "box",
+    ONEDRIVE: "onedrive",
+    HUDDLE: "huddle",
+  };
+  static activities = {
+    START_FROM: "start-from",
+    CAMERA: "camera",
+    DRAW: "draw",
+    UPLOAD_LIST: "upload-list",
+    URL: "url",
+    CLOUD_IMG_EDIT: "cloud-image-edit",
+    EXTERNAL: "external",
+  };
+  static reg = () => {};
+  static styleAttrs = [];
+  static is = `sym-1`;
+  static bindAttributes = () => {};
+};
 export const UID = class {
   static generate = () => {};
   static apply = () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/file-uploader",
-  "version": "1.15.0-alpha.3",
+  "version": "1.15.0-alpha.5",
   "description": "Building blocks for Uploadcare products integration",
   "keywords": [
     "web components",

package/solutions/file-uploader/minimal/FileUploaderMinimal.d.ts

@@ -1,11 +1,13 @@
 export class FileUploaderMinimal extends SolutionBlock {
     init$: {
         singleUpload: boolean;
+        isHiddenStartFrom: boolean;
+        classUploadList: string;
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
         '*collectionErrors': any[];
-        '*collectionState': import("../inline/index.js").OutputCollectionState<import("../inline/index.js").OutputCollectionStatus, "maybe-has-group"> | null;
+        '*collectionState': import("./index.js").OutputCollectionState<import("./index.js").OutputCollectionStatus, "maybe-has-group"> | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
         '*secureUploadsManager': import("../../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;

package/solutions/file-uploader/minimal/FileUploaderMinimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUploaderMinimal.d.ts","sourceRoot":"","sources":["FileUploaderMinimal.js"],"names":[],"mappings":"AAIA;IAMI;;;;;;;;;;;;;;;MAGC;CAsDJ;;;;8BAlE6B,oCAAoC"}
+{"version":3,"file":"FileUploaderMinimal.d.ts","sourceRoot":"","sources":["FileUploaderMinimal.js"],"names":[],"mappings":"AAKA;IAMI;;;;;;;;;;;;;;;;;MAKC;CAiFJ;;;;8BA/F6B,oCAAoC"}

package/solutions/file-uploader/minimal/FileUploaderMinimal.js

@@ -1,3 +1,4 @@
+//@ts-check
 import { ActivityBlock } from '../../../abstract/ActivityBlock.js';
 import { SolutionBlock } from '../../../abstract/SolutionBlock.js';
 import { ModalEvents } from '../../../abstract/ModalManager.js';
@@ -11,6 +12,8 @@ export class FileUploaderMinimal extends SolutionBlock {
     this.init$ = {
       ...this.init$,
       singleUpload: false,
+      isHiddenStartFrom: false,
+      classUploadList: '',
     };
   }
 
@@ -20,6 +23,10 @@ export class FileUploaderMinimal extends SolutionBlock {
     /** @type {import('../../../abstract/UploaderBlock.js').UploaderBlock} */
     const uBlock = this.ref.uBlock;
     this.sub('*currentActivity', (val) => {
+      if (val === ActivityBlock.activities.UPLOAD_LIST) {
+        this.modalManager.closeAll();
+      }
+
       if (!val) {
         this.$['*currentActivity'] = uBlock.initActivity || ActivityBlock.activities.START_FROM;
       }
@@ -29,23 +36,20 @@ export class FileUploaderMinimal extends SolutionBlock {
       if (list?.length > 0) {
         this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
       } else {
+        this.set$({
+          classUploadList: '',
+        });
         this.$['*currentActivity'] = uBlock.initActivity || ActivityBlock.activities.START_FROM;
       }
     });
 
-    this.subConfigValue('sourceList', (sourceList) => {
-      if (sourceList !== 'local') {
-        this.cfg.sourceList = 'local';
-      }
-    });
-
     this.subConfigValue('confirmUpload', (confirmUpload) => {
       if (confirmUpload !== false) {
         this.cfg.confirmUpload = false;
       }
     });
 
-    this.subConfigValue('displayUploadList', (mode) => {
+    this.subConfigValue('filesViewMode', (mode) => {
       this.setAttribute('mode', mode);
     });
 
@@ -59,20 +63,66 @@ export class FileUploaderMinimal extends SolutionBlock {
       this.$.singleUpload = !multiple;
     });
 
-    this.modalManager.subscribe(ModalEvents.CLOSE, (e) => {
-      if (e.id === ActivityBlock.activities.CLOUD_IMG_EDIT) {
-        this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
+    this.modalManager.subscribe(ModalEvents.OPEN, () => {
+      if (this.$['*currentActivity'] === ActivityBlock.activities.UPLOAD_LIST) {
+        this.set$({
+          classUploadList: 'active',
+          isHiddenStartFrom: true,
+        });
       }
     });
+
+    this.modalManager.subscribe(
+      ModalEvents.CLOSE,
+      (
+        /**
+         * @type {{
+         *   id: import('../../../abstract/ModalManager.js').ModalId;
+         *   modal: import('../../../abstract/ModalManager.js').ModalNode;
+         * }}
+         */ e,
+      ) => {
+        if (e.id === this.$['*currentActivity']) {
+          this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
+          this.set$({
+            isHiddenStartFrom: false,
+          });
+        }
+
+        if (e.id === ActivityBlock.activities.CLOUD_IMG_EDIT) {
+          this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
+        }
+      },
+    );
   }
 }
 
 FileUploaderMinimal.template = /* HTML */ `
-  <uc-start-from>
-    <uc-drop-area set="@single:singleUpload" tabindex="0" clickable l10n="choose-file"></uc-drop-area>
+  <uc-start-from set="@hidden: isHiddenStartFrom">
+    <uc-drop-area set="@single:singleUpload;" initflow clickable tabindex="0" l10n="choose-file"></uc-drop-area>
     <uc-copyright></uc-copyright>
   </uc-start-from>
-  <uc-upload-list ref="uBlock"></uc-upload-list>
+  <uc-upload-list set="@class:classUploadList" ref="uBlock"></uc-upload-list>
+
+  <uc-modal id="start-from" strokes block-body-scrolling>
+    <uc-start-from>
+      <uc-drop-area with-icon clickable></uc-drop-area>
+      <uc-source-list role="list" wrap></uc-source-list>
+      <button type="button" l10n="start-from-cancel" class="uc-secondary-btn" set="onclick: *historyBack"></button>
+    </uc-start-from>
+  </uc-modal>
+
+  <uc-modal id="camera" strokes block-body-scrolling>
+    <uc-camera-source></uc-camera-source>
+  </uc-modal>
+
+  <uc-modal id="url" strokes block-body-scrolling>
+    <uc-url-source></uc-url-source>
+  </uc-modal>
+
+  <uc-modal id="external" strokes block-body-scrolling>
+    <uc-external-source></uc-external-source>
+  </uc-modal>
 
   <uc-modal id="cloud-image-edit" strokes block-body-scrolling>
     <uc-cloud-image-editor-activity></uc-cloud-image-editor-activity>

package/solutions/file-uploader/minimal/index.css

@@ -1,13 +1,18 @@
-@import url('../../../blocks/themes/uc-basic/config.css');
+@import url('../../../blocks/themes/uc-basic/index.css');
+
+/* @import url('../../../blocks/themes/uc-basic/config.css'); */
 
 /* COMMON STYLES */
-@import url('../../../blocks/themes/uc-basic/common.css');
+
+/* @import url('../../../blocks/themes/uc-basic/common.css'); */
 
 /* THEME */
-@import url('../../../blocks/themes/uc-basic/theme.css');
+
+/* @import url('../../../blocks/themes/uc-basic/theme.css'); */
 
 /* BLOCKS: */
-@import url('../../../blocks/StartFrom/start-from.css');
+
+/* @import url('../../../blocks/StartFrom/start-from.css');
 @import url('../../../blocks/DropArea/drop-area.css');
 @import url('../../../blocks/UploadList/upload-list.css');
 @import url('../../../blocks/FileItem/file-item.css');
@@ -16,7 +21,7 @@
 @import url('../../../blocks/Copyright/copyright.css');
 @import url('../../../blocks/Modal/modal.css');
 @import url('../../../blocks/CloudImageEditor/index.css');
-@import url('../../../blocks/CloudImageEditorActivity/index.css');
+@import url('../../../blocks/CloudImageEditorActivity/index.css'); */
 
 /* ICONS: */
 :where([uc-file-uploader-minimal]) {
@@ -27,7 +32,7 @@
   display: block;
 }
 
-[uc-file-uploader-minimal] uc-start-from .uc-content {
+[uc-file-uploader-minimal] > uc-start-from .uc-content {
   display: flex;
   flex-direction: column;
   gap: 4px;
@@ -37,7 +42,7 @@
   background-color: transparent;
 }
 
-:where([uc-file-uploader-minimal] uc-drop-area) {
+:where([uc-file-uploader-minimal] > uc-start-from uc-drop-area) {
   display: flex;
   position: relative;
   align-items: center;
@@ -50,12 +55,12 @@
   border-radius: calc(var(--uc-radius) * 1.75);
 }
 
-:where(.uc-contrast) :where([uc-file-uploader-minimal] uc-drop-area) {
+:where(.uc-contrast) :where([uc-file-uploader-minimal] > uc-start-from uc-drop-area) {
   background-color: transparent;
 }
 
 /* hack to make transparent :hover colors work in any conditions */
-:where([uc-file-uploader-minimal] uc-drop-area)::before {
+:where([uc-file-uploader-minimal] > uc-start-from uc-drop-area)::before {
   content: '';
   z-index: -1;
   width: 100%;
@@ -64,7 +69,7 @@
   background-color: var(--uc-background);
 }
 
-:where([uc-file-uploader-minimal]:has([single]) uc-drop-area) {
+:where([uc-file-uploader-minimal]:has([single]) > uc-start-from uc-drop-area) {
   aspect-ratio: var(--uc-grid-aspect-ratio);
 }
 
@@ -118,10 +123,6 @@
   display: flex;
 }
 
-[uc-file-uploader-minimal] uc-file-item .uc-edit-btn {
-  /* display: none; */
-}
-
 [uc-file-uploader-minimal] uc-file-item uc-progress-bar {
   top: 0 !important;
   height: 100% !important;

package/solutions/file-uploader/minimal/index.d.ts

@@ -1,17 +1,2 @@
-export { defineComponents } from "../../../abstract/defineComponents.js";
-export { defineLocale } from "../../../abstract/localeRegistry.js";
-export { FileUploaderMinimal } from "./FileUploaderMinimal.js";
-export { StartFrom } from "../../../blocks/StartFrom/StartFrom.js";
-export { DropArea } from "../../../blocks/DropArea/DropArea.js";
-export { UploadList } from "../../../blocks/UploadList/UploadList.js";
-export { FileItem } from "../../../blocks/FileItem/FileItem.js";
-export { Icon } from "../../../blocks/Icon/Icon.js";
-export { ProgressBar } from "../../../blocks/ProgressBar/ProgressBar.js";
-export { Copyright } from "../../../blocks/Copyright/Copyright.js";
-export { FormInput } from "../../../blocks/FormInput/FormInput.js";
-export { Config } from "../../../blocks/Config/Config.js";
-export { UploadCtxProvider } from "../../../blocks/UploadCtxProvider/UploadCtxProvider.js";
-export { Modal } from "../../../blocks/Modal/Modal.js";
-export * from "../../../blocks/CloudImageEditor/index.js";
-export { CloudImageEditorActivity } from "../../../blocks/CloudImageEditorActivity/CloudImageEditorActivity.js";
+export * from "../../../index.js";
 //# sourceMappingURL=index.d.ts.map

package/solutions/file-uploader/minimal/index.js

@@ -1,18 +1 @@
-export { defineComponents } from '../../../abstract/defineComponents.js';
-export { defineLocale } from '../../../abstract/localeRegistry.js';
-export { FileUploaderMinimal } from './FileUploaderMinimal.js';
-export { StartFrom } from '../../../blocks/StartFrom/StartFrom.js';
-export { DropArea } from '../../../blocks/DropArea/DropArea.js';
-export { UploadList } from '../../../blocks/UploadList/UploadList.js';
-export { FileItem } from '../../../blocks/FileItem/FileItem.js';
-export { Icon } from '../../../blocks/Icon/Icon.js';
-export { ProgressBar } from '../../../blocks/ProgressBar/ProgressBar.js';
-export { Copyright } from '../../../blocks/Copyright/Copyright.js';
-export { FormInput } from '../../../blocks/FormInput/FormInput.js';
-export { Config } from '../../../blocks/Config/Config.js';
-export { UploadCtxProvider } from '../../../blocks/UploadCtxProvider/UploadCtxProvider.js';
-
-export { Modal } from '../../../blocks/Modal/Modal.js';
-
-export * from '../../../blocks/CloudImageEditor/index.js';
-export { CloudImageEditorActivity } from '../../../blocks/CloudImageEditorActivity/CloudImageEditorActivity.js';
+export * from '../../../index.js';

package/solutions/file-uploader/regular/FileUploaderRegular.d.ts

@@ -1,7 +1,7 @@
 export class FileUploaderRegular extends SolutionBlock {
     init$: {
         isHidden: boolean;
-        /** @param {unknown} value */ '*commonProgress': number;
+        '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
         '*collectionErrors': any[];
@@ -15,8 +15,6 @@ export class FileUploaderRegular extends SolutionBlock {
         '*historyBack': null;
         '*closeModal': () => void;
     };
-    /** @private */
-    private _lastModalActive;
 }
 export namespace FileUploaderRegular {
     let template: string;

package/solutions/file-uploader/regular/FileUploaderRegular.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUploaderRegular.d.ts","sourceRoot":"","sources":["FileUploaderRegular.js"],"names":[],"mappings":"AAKA;IAMI;;QAWE,6BAA6B;;;;;;;;;;;;;MAR9B;IAoBG,eAAe;IACf,yBAAmC;CAK1C;;;;8BAvC6B,oCAAoC"}
+{"version":3,"file":"FileUploaderRegular.d.ts","sourceRoot":"","sources":["FileUploaderRegular.js"],"names":[],"mappings":"AAIA;IAMI;;;;;;;;;;;;;;;MAGC;CAaJ;;;;8BAzB6B,oCAAoC"}

package/solutions/file-uploader/regular/FileUploaderRegular.js

@@ -1,7 +1,6 @@
 // @ts-check
 import { SolutionBlock } from '../../../abstract/SolutionBlock.js';
-import { asBoolean } from '../../../blocks/Config/normalizeConfigValue.js';
-import { EventType } from '../../../blocks/UploadCtxProvider/EventEmitter.js';
+import { asBoolean } from '../../../blocks/Config/validatorsType.js';
 
 export class FileUploaderRegular extends SolutionBlock {
   static styleAttrs = [...super.styleAttrs, 'uc-file-uploader-regular'];
@@ -24,19 +23,6 @@ export class FileUploaderRegular extends SolutionBlock {
         this.set$({ isHidden: asBoolean(value) });
       },
     );
-
-    this.sub(
-      '*modalActive',
-      (modalActive) => {
-        if (this._lastModalActive !== modalActive) {
-          this.emit(modalActive ? EventType.MODAL_OPEN : EventType.MODAL_CLOSE, undefined, { debounce: true });
-        }
-
-        /** @private */
-        this._lastModalActive = modalActive;
-      },
-      false,
-    );
   }
 }