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

package/abstract/ActivityBlock.js

@@ -187,8 +187,8 @@ export class ActivityBlock extends Block {
         couldOpenActivity = /** @type {ActivityBlock} */ (nextActivityBlock)?.couldOpenActivity ?? false;
       }
 
-      // TODO: Возможно стоит обработать поведение activity start-from для minimal mode
-      console.log({ nextActivity });
+      // // TODO: Возможно стоит обработать поведение activity start-from для minimal mode
+      // console.log({ nextActivity });
 
       nextActivity = couldOpenActivity ? nextActivity : undefined;
 

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

@@ -1 +1 @@
-{"version":3,"file":"FileItem.d.ts","sourceRoot":"","sources":["FileItem.js"],"names":[],"mappings":"AAoBA;IAIE,eAAe;IACf,mBAAuB;IACvB;;;OAGG;IACH,eAAc;IACd,eAAe;IACf,wBAAwB;IACxB,eAAe;IACf,gCAA4E;IAC5E,eAAe;IACf,iCAA0E;IAE1E,eAAe;IACf,sBAAsB;IAKpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+BC;IAGH,eASC;IAED;;;OAGG;IACH,0BAcC;IAXC,wCAA0C;IAa5C,eAAe;IACf,wBAgBC;IAED,eAAe;IACf,2BAuCC;IAED;;;;OAIG;IACH,kBAUC;IAED;;MAaQ;IAER;;;OAGG;IACH,uBAmDC;IA+CD,wEAAwE;IACxE,oBADY,CAAC,oBAAoB,CAAC,CAAC,MAAM,oBAAoB,CAAC,QA0B7D;IAaC,eAAe;IACf,kBAEE;IAWJ;;;MAEC;IAED;;;OAGG;IACH,uBAEC;IAED,wBAsFC;CACF;;;;;8BApc6B,iCAAiC;AAS/D;;;;;GAKG"}
+{"version":3,"file":"FileItem.d.ts","sourceRoot":"","sources":["FileItem.js"],"names":[],"mappings":"AAoBA;IAIE,eAAe;IACf,mBAAuB;IACvB;;;OAGG;IACH,eAAc;IACd,eAAe;IACf,wBAAwB;IACxB,eAAe;IACf,gCAA4E;IAC5E,eAAe;IACf,iCAA0E;IAE1E,eAAe;IACf,sBAAsB;IAKpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+BC;IAGH,eASC;IAED;;;OAGG;IACH,0BAeC;IAXC,wCAA0C;IAa5C,eAAe;IACf,wBAgBC;IAED,eAAe;IACf,2BAyCC;IAED;;;;OAIG;IACH,kBAUC;IAED;;MAaQ;IAER;;;OAGG;IACH,uBAmDC;IA+CD,wEAAwE;IACxE,oBADY,CAAC,oBAAoB,CAAC,CAAC,MAAM,oBAAoB,CAAC,QA0B7D;IAaC,eAAe;IACf,kBAEE;IAWJ;;;MAEC;IAED;;;OAGG;IACH,uBAEC;IAED,wBAsFC;CACF;;;;;8BAvc6B,iCAAiC;AAS/D;;;;;GAKG"}

package/blocks/FileItem/FileItem.js

@@ -93,6 +93,7 @@ export class FileItem extends UploaderBlock {
    */
   _observerCallback(entries) {
     let [entry] = entries;
+
     this._isIntersecting = entry.isIntersecting;
     this._thumbRect = entry.boundingClientRect;
 
@@ -103,7 +104,7 @@ export class FileItem extends UploaderBlock {
     if (entry.intersectionRatio === 0) {
       this._debouncedGenerateThumb.cancel();
     } else {
-      this._debouncedGenerateThumb();
+      if (!this.$.thumbUrl) this._debouncedGenerateThumb();
     }
   }
 
@@ -133,8 +134,14 @@ export class FileItem extends UploaderBlock {
     }
     let entry = this._entry;
 
+    console.log('_generateThumbnail');
+
     if (entry.getValue('fileInfo') && entry.getValue('isImage')) {
-      let size = this.cfg.thumbSize;
+      let size = Math.max(
+        parseInt(String(this?._thumbRect?.height || 0)),
+        parseInt(String(this?._thumbRect?.width || 0)),
+        this.cfg.thumbSize,
+      );
 
       let thumbUrl = await this.proxyUrl(
         createCdnUrl(
@@ -150,10 +157,6 @@ export class FileItem extends UploaderBlock {
       return;
     }
 
-    if (entry.getValue('thumbUrl')) {
-      return;
-    }
-
     if (entry.getValue('file')?.type.includes('image')) {
       try {
         let thumbUrl = await generateThumb(entry.getValue('file'), this.cfg.thumbSize);

package/blocks/Thumb/Thumb.d.ts

@@ -2,6 +2,7 @@ export class Thumb extends UploaderBlock {
     init$: {
         thumbUrl: string;
         badgeIcon: string;
+        uid: string;
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;

package/blocks/Thumb/Thumb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Thumb.d.ts","sourceRoot":"","sources":["Thumb.js"],"names":[],"mappings":"AAIA;IAII;;;;;;;;;;;;;;;;MAIC;CAeJ;;;;8BAzB6B,iCAAiC"}
+{"version":3,"file":"Thumb.d.ts","sourceRoot":"","sources":["Thumb.js"],"names":[],"mappings":"AAIA;IAII;;;;;;;;;;;;;;;;;MAKC;CAeJ;;;;8BA1B6B,iCAAiC"}

package/blocks/Thumb/Thumb.js

@@ -10,6 +10,7 @@ export class Thumb extends UploaderBlock {
       ...this.init$,
       thumbUrl: '',
       badgeIcon: '',
+      uid: '',
     };
   }
 
@@ -42,4 +43,6 @@ Thumb.bindAttributes({
   thumbUrl: null,
   // @ts-expect-error TODO: fix types inside symbiote
   badgeIcon: null,
+  // @ts-expect-error TODO: fix types inside symbiote
+  id: null,
 });

package/index.ssr.js

@@ -1299,7 +1299,7 @@ export const Thumb = class {
     </div>
   </slot>
 `;
-  static observedAttributes = ["thumbUrl", "badgeIcon"];
+  static observedAttributes = ["thumbUrl", "badgeIcon", "id"];
   static extSrcList = {
     FACEBOOK: "facebook",
     DROPBOX: "dropbox",

package/package.json

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

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

@@ -3,6 +3,7 @@ export class FileUploaderMinimal extends SolutionBlock {
         singleUpload: boolean;
         isHiddenStartFrom: boolean;
         classUploadList: string;
+        classStartFrom: string;
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;

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

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

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

@@ -3,6 +3,9 @@ import { ActivityBlock } from '../../../abstract/ActivityBlock.js';
 import { SolutionBlock } from '../../../abstract/SolutionBlock.js';
 import { ModalEvents } from '../../../abstract/ModalManager.js';
 
+const ACTIVE_CLASS = 'active';
+const EMPTY_CLASS = '';
+
 export class FileUploaderMinimal extends SolutionBlock {
   static styleAttrs = [...super.styleAttrs, 'uc-file-uploader-minimal'];
 
@@ -13,7 +16,8 @@ export class FileUploaderMinimal extends SolutionBlock {
       ...this.init$,
       singleUpload: false,
       isHiddenStartFrom: false,
-      classUploadList: '',
+      classUploadList: EMPTY_CLASS,
+      classStartFrom: EMPTY_CLASS,
     };
   }
 
@@ -35,9 +39,12 @@ export class FileUploaderMinimal extends SolutionBlock {
     this.sub('*uploadList', (list) => {
       if (list?.length > 0) {
         this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
+        this.set$({
+          classStartFrom: EMPTY_CLASS,
+        });
       } else {
         this.set$({
-          classUploadList: '',
+          classUploadList: EMPTY_CLASS,
         });
         this.$['*currentActivity'] = uBlock.initActivity || ActivityBlock.activities.START_FROM;
       }
@@ -66,10 +73,16 @@ export class FileUploaderMinimal extends SolutionBlock {
     this.modalManager.subscribe(ModalEvents.OPEN, () => {
       if (this.$['*currentActivity'] === ActivityBlock.activities.UPLOAD_LIST) {
         this.set$({
-          classUploadList: 'active',
+          classUploadList: ACTIVE_CLASS,
           isHiddenStartFrom: true,
         });
       }
+
+      if (this.$['*uploadList']?.length <= 0) {
+        this.set$({
+          classStartFrom: ACTIVE_CLASS,
+        });
+      }
     });
 
     this.modalManager.subscribe(
@@ -98,7 +111,7 @@ export class FileUploaderMinimal extends SolutionBlock {
 }
 
 FileUploaderMinimal.template = /* HTML */ `
-  <uc-start-from set="@hidden: isHiddenStartFrom">
+  <uc-start-from set="@hidden: isHiddenStartFrom; @class:classStartFrom">
     <uc-drop-area set="@single:singleUpload;" initflow clickable tabindex="0" l10n="choose-file"></uc-drop-area>
     <uc-copyright></uc-copyright>
   </uc-start-from>