fix(init-flow): fix sync initFlow calls right after upload collecti…

…on (#532)
uploadcare · Oct 6, 2023 · f4f4dea · f4f4dea
1 parent c4a3c0c
commit f4f4dea
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/abstract/ActivityBlock.js b/abstract/ActivityBlock.js
@@ -161,7 +161,7 @@ export class ActivityBlock extends Block {
       this.$['*currentActivity'] = nextActivity;
       this.$['*history'] = history;
       if (!nextActivity) {
-        this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
+        this.setOrAddState('*modalActive', false);
       }
     }
   }

diff --git a/abstract/Block.js b/abstract/Block.js
@@ -102,14 +102,16 @@ export class Block extends BaseComponent {
   }
 
   /**
-   * @param {String} consumerScope
    * @param {String} prop
    * @param {any} newVal
    */
-  setForCtxTarget(consumerScope, prop, newVal) {
-    if (this.hasBlockInCtx((b) => /** @type {typeof Block} */ (b.constructor).StateConsumerScope === consumerScope)) {
-      this.$[prop] = newVal;
-    }
+  setOrAddState(prop, newVal) {
+    this.add$(
+      {
+        [prop]: newVal,
+      },
+      true
+    );
   }
 
   /** @param {String} activityType */

diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js
@@ -229,7 +229,7 @@ export class UploaderBlock extends ActivityBlock {
       [...this.fileInput['files']].forEach((file) => this.addFileFromObject(file, { source: UploadSource.LOCAL }));
       // To call uploadTrigger UploadList should draw file items first:
       this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
-      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
+      this.setOrAddState('*modalActive', true);
       // @ts-ignore TODO: fix this
       this.fileInput['value'] = '';
       this.fileInput = null;
@@ -249,11 +249,11 @@ export class UploaderBlock extends ActivityBlock {
 
   /** @param {Boolean} [force] */
   initFlow(force = false) {
-    if (this.$['*uploadList']?.length && !force) {
+    if (this.uploadCollection.size > 0 && !force) {
       this.set$({
         '*currentActivity': ActivityBlock.activities.UPLOAD_LIST,
       });
-      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
+      this.setOrAddState('*modalActive', true);
     } else {
       if (this.sourceList?.length === 1) {
         let srcKey = this.sourceList[0];
@@ -272,14 +272,14 @@ export class UploaderBlock extends ActivityBlock {
           } else {
             this.$['*currentActivity'] = srcKey;
           }
-          this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
+          this.setOrAddState('*modalActive', true);
         }
       } else {
         // Multiple sources case:
         this.set$({
           '*currentActivity': ActivityBlock.activities.START_FROM,
         });
-        this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
+        this.setOrAddState('*modalActive', true);
       }
     }
     EventManager.emit(
@@ -298,7 +298,7 @@ export class UploaderBlock extends ActivityBlock {
       '*history': this.doneActivity ? [this.doneActivity] : [],
     });
     if (!this.$['*currentActivity']) {
-      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
+      this.setOrAddState('*modalActive', false);
     }
     EventManager.emit(
       new EventData({

diff --git a/blocks/DropArea/DropArea.js b/blocks/DropArea/DropArea.js
@@ -89,7 +89,7 @@ export class DropArea extends UploaderBlock {
           this.set$({
             '*currentActivity': ActivityBlock.activities.UPLOAD_LIST,
           });
-          this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
+          this.setOrAddState('*modalActive', true);
         }
       },
     });

diff --git a/blocks/Modal/Modal.js b/blocks/Modal/Modal.js
@@ -19,7 +19,7 @@ export class Modal extends Block {
   };
 
   _closeDialog = () => {
-    this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
+    this.setOrAddState('*modalActive', false);
   };
 
   _handleDialogClose = () => {

diff --git a/blocks/UploadList/UploadList.js b/blocks/UploadList/UploadList.js
@@ -65,6 +65,14 @@ export class UploadList extends UploaderBlock {
     }
     this._updateUploadsState();
     this._updateCountLimitMessage();
+
+    if (
+      this.$['*uploadList']?.length === 0 &&
+      !this.cfg.showEmptyList &&
+      this.$['*currentActivity'] === this.activityType
+    ) {
+      this.historyBack();
+    }
   }, 0);
 
   /**
@@ -223,10 +231,6 @@ export class UploadList extends UploaderBlock {
         hasFiles: list.length > 0,
       });
 
-      if (list?.length === 0 && !this.cfg.showEmptyList) {
-        this.historyBack();
-      }
-
       if (!this.cfg.confirmUpload) {
         this.add$(
           {