@uploadcare/file-uploader 1.13.3-alpha.0 → 1.15.0-alpha.0

package/abstract/ActivityBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActivityBlock.d.ts","sourceRoot":"","sources":["ActivityBlock.js"],"names":[],"mappings":"AASA;;;;;GAKG;AAEH;IA4FE;;;;;;OAMG;IACH,kCAAsC;IAlGtC,iBAAiB;IACjB,kCAAuB;IAEvB;;;;;;MAA+B;IAE/B;;MAAqE;IAErE,eAAe;IACf,oBAKC;IAED,eAAe;IACf,kBAaC;IA2CD,eAAe;IACf,sBAWC;IAED,eAAe;IACf,8BAEC;IAWD,4CAEC;IAED,iCAEC;IAED;;;;;;;OAOG;IACH;4BAHiB,IAAI;8BACJ,IAAI;yBAQpB;IAED,2BAKC;IAoBD,0BAEC;IAED,yDAAyD;IACzD,oLAEC;IAED,qBAAqB;IACrB,2BAEC;IAED,qBAAqB;IACrB,2BAEC;IAED,oBAoBC;IAlLC,8CAAyB;CAmL5B;;;;;;;;;;;;gCApMY;IACZ,kBAAsB,EAAE,OAAO,gEAAgE,EAAE,cAAc,CAAC;IAChH,UAAc,OAAO,4CAA4C,EAAE,cAAc,CAAC;CAC/E;qCA6MU,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,CAAC;2BAChF,sBAAsB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,IAAI;sBAxNrC,YAAY"}
+{"version":3,"file":"ActivityBlock.d.ts","sourceRoot":"","sources":["ActivityBlock.js"],"names":[],"mappings":"AASA;;;;;GAKG;AAEH;IA+EE;;;;;;OAMG;IACH,kCAAsC;IArFtC,iBAAiB;IACjB,kCAAuB;IAEvB;;;;;;MAA+B;IAE/B;;MAAqE;IAErE,eAAe;IACf,oBAKC;IAED,eAAe;IACf,kBAaC;IA8BD,eAAe;IACf,sBAWC;IAED,eAAe;IACf,8BAEC;IAWD,4CAEC;IAED,iCAEC;IAED;;;;;;;OAOG;IACH;4BAHiB,IAAI;8BACJ,IAAI;yBAQpB;IAED,2BAKC;IAoBD,0BAEC;IAED,yDAAyD;IACzD,oLAEC;IAED,qBAAqB;IACrB,2BAEC;IAED,qBAAqB;IACrB,2BAEC;IAED,oBA4BC;IA7KC,8CAAyB;CA8K5B;;;;;;;;;;;;gCA/LY;IACZ,kBAAsB,EAAE,OAAO,gEAAgE,EAAE,cAAc,CAAC;IAChH,UAAc,OAAO,4CAA4C,EAAE,cAAc,CAAC;CAC/E;qCAwMU,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,YAAY,CAAC,CAAC;2BAChF,sBAAsB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,IAAI;sBAnNrC,YAAY"}

package/abstract/ActivityBlock.js

@@ -49,11 +49,6 @@ export class ActivityBlock extends Block {
   /** @protected */
   initCallback() {
     super.initCallback();
-    if (this.hasAttribute('current-activity')) {
-      this.sub('*currentActivity', (/** @type {String} */ val) => {
-        this.setAttribute('current-activity', val);
-      });
-    }
 
     // TODO: rename activityType to activityId
     if (this.activityType) {
@@ -76,14 +71,6 @@ export class ActivityBlock extends Block {
           this.$['*history'] = [];
         }
       });
-
-      if (this.has('*modalActive')) {
-        this.sub('*modalActive', (modalActive) => {
-          if (!modalActive && this.activityType === this.$['*currentActivity']) {
-            this.$['*currentActivity'] = null;
-          }
-        });
-      }
     }
   }
 
@@ -160,7 +147,7 @@ export class ActivityBlock extends Block {
 
     if (!hasCurrentActivityInCtx) {
       this.$['*currentActivity'] = null;
-      this.setOrAddState('*modalActive', false);
+      // this.setOrAddState('*modalActive', false);
     }
   }
 
@@ -186,21 +173,29 @@ export class ActivityBlock extends Block {
   historyBack() {
     /** @type {String[]} */
     let history = this.$['*history'];
+
     if (history) {
       let nextActivity = history.pop();
+
       while (nextActivity === this.activityType) {
         nextActivity = history.pop();
       }
+
       let couldOpenActivity = !!nextActivity;
       if (nextActivity) {
         const nextActivityBlock = [...this.blocksRegistry].find((block) => block.activityType === nextActivity);
         couldOpenActivity = /** @type {ActivityBlock} */ (nextActivityBlock)?.couldOpenActivity ?? false;
       }
+
       nextActivity = couldOpenActivity ? nextActivity : undefined;
+
+      if (nextActivity) this.modalManager.open(nextActivity);
+
       this.$['*currentActivity'] = nextActivity;
       this.$['*history'] = history;
+
       if (!nextActivity) {
-        this.setOrAddState('*modalActive', false);
+        this.modalManager.closeAll();
       }
     }
   }

package/abstract/Block.d.ts

@@ -58,6 +58,11 @@ export class Block extends BaseComponent<any> {
      * @param {any} newVal
      */
     setOrAddState(prop: string, newVal: any): void;
+    /**
+     * @returns {ModalManager}
+     * @public
+     */
+    public get modalManager(): ModalManager;
     /**
      * @private
      * @returns {LocaleManager | null}
@@ -97,5 +102,6 @@ export class Block extends BaseComponent<any> {
 }
 export { BaseComponent };
 import { BaseComponent } from '@symbiotejs/symbiote';
+import { ModalManager } from './ModalManager.js';
 import { A11y } from './a11y.js';
 //# sourceMappingURL=Block.d.ts.map

package/abstract/Block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Block.d.ts","sourceRoot":"","sources":["Block.js"],"names":[],"mappings":"AAmBA;IACE,4BAA4B;IAC5B,2BADW,MAAM,GAAG,IAAI,CACS;IAEjC,uBAAuB;IACvB,mBADW,MAAM,EAAE,CACI;IAsTvB,6BAA6B;IAC7B,4CAQC;IA3QD,cAMC;IAxDD,iBAAiB;IACjB,kCAAuB;IAEvB,wDAAwD;IACxD,cADW,OAAO,oBAAoB,EAAE,YAAY,CAChC;IAEpB,UAAmB;IAEnB;;;;OAIG;IACH;;eAcC;IAED;;;;;OAKG;IACH,kBAIC;IAED;;;;OAIG;IACH,wBAJW,MAAM,YACN,MAAM,IAAI,QAKpB;IAIC,uDAAuD;IACvD,mBADW,IAAI,MAAM,EAAE,IAAI;QAAE,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAC,CACjB;IAKpC;;;;OAIG;IACH,WAJW;;qBAAuF,CAAC,CAAC,YACzF;;qBAAuF,CAAC,CAAC,YACzF;;qBAAuF,CAAC,CAAC,QASnG;IAED;;;OAGG;IACH,gCAHmB,KAAK,KAAK,OAAO,WAUnC;IAED;;;OAGG;IACH,oCAFW,GAAG,QASb;IAkED;;;OAGG;IACH,4BAEC;IAED;;;OAGG;IACH,kCAEC;IAED,yBAAyB;IACzB,iCAEC;IAwBD;;;;OAIG;IACH,qCAIC;IAED;;;;OAIG;IACH,iCAHa,eAAe,CA6B3B;IAED,iDAAiD;IACjD,yCA8BC;IA3BG,eAAe;IACf,mBAuBE;IAKN;;;;OAIG;IACH,6HAFwD,IAAI,QAQ3D;IAED,8BAA8B;IAC9B,oBADY,OAAO,EAAE,QAWpB;CAYF;;8BAvVmC,sBAAsB;qBAarC,WAAW"}
+{"version":3,"file":"Block.d.ts","sourceRoot":"","sources":["Block.js"],"names":[],"mappings":"AAoBA;IACE,4BAA4B;IAC5B,2BADW,MAAM,GAAG,IAAI,CACS;IAEjC,uBAAuB;IACvB,mBADW,MAAM,EAAE,CACI;IAoUvB,6BAA6B;IAC7B,4CAQC;IAzRD,cAMC;IAxDD,iBAAiB;IACjB,kCAAuB;IAEvB,wDAAwD;IACxD,cADW,OAAO,oBAAoB,EAAE,YAAY,CAChC;IAEpB,UAAmB;IAEnB;;;;OAIG;IACH;;eAcC;IAED;;;;;OAKG;IACH,kBAIC;IAED;;;;OAIG;IACH,wBAJW,MAAM,YACN,MAAM,IAAI,QAKpB;IAIC,uDAAuD;IACvD,mBADW,IAAI,MAAM,EAAE,IAAI;QAAE,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC,CAAC,CACjB;IAKpC;;;;OAIG;IACH,WAJW;;qBAAuF,CAAC,CAAC,YACzF;;qBAAuF,CAAC,CAAC,YACzF;;qBAAuF,CAAC,CAAC,QASnG;IAED;;;OAGG;IACH,gCAHmB,KAAK,KAAK,OAAO,WAUnC;IAED;;;OAGG;IACH,oCAFW,GAAG,QASb;IAsED;;;OAGG;IACH,wCAEC;IAED;;;OAGG;IACH,4BAEC;IAED;;;OAGG;IACH,kCAEC;IAED,yBAAyB;IACzB,iCAEC;IAwBD;;;;OAIG;IACH,qCAMC;IAED;;;;OAIG;IACH,iCAHa,eAAe,CA6B3B;IAED,iDAAiD;IACjD,yCA8BC;IA3BG,eAAe;IACf,mBAuBE;IAKN;;;;OAIG;IACH,6HAFwD,IAAI,QAQ3D;IAED,8BAA8B;IAC9B,oBADY,OAAO,EAAE,QAWpB;CAYF;;8BAtWmC,sBAAsB;6BAc7B,mBAAmB;qBAD3B,WAAW"}

package/abstract/Block.js

@@ -13,6 +13,7 @@ import { LocaleManager, localeStateKey } from './LocaleManager.js';
 import { l10nProcessor } from './l10nProcessor.js';
 import { sharedConfigKey } from './sharedConfigKey.js';
 import { A11y } from './a11y.js';
+import { ModalManager } from './ModalManager.js';
 
 const TAG_PREFIX = 'uc-';
 
@@ -180,12 +181,24 @@ export class Block extends BaseComponent {
       this.add('*a11y', new A11y());
     }
 
+    if (!this.has('*modalManager')) {
+      this.add('*modalManager', new ModalManager(this));
+    }
+
     this.sub(localeStateKey('locale-id'), (localeId) => {
       const direction = getLocaleDirection(localeId);
       this.style.direction = direction === 'ltr' ? '' : direction;
     });
   }
 
+  /**
+   * @returns {ModalManager}
+   * @public
+   */
+  get modalManager() {
+    return this.has('*modalManager') && this.$['*modalManager'];
+  }
+
   /**
    * @private
    * @returns {LocaleManager | null}
@@ -238,6 +251,8 @@ export class Block extends BaseComponent {
     Data.deleteCtx(this.ctxName);
 
     this.localeManager?.destroy();
+
+    this.modalManager?.destroy();
   }
 
   /**

package/abstract/CTX.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CTX.d.ts","sourceRoot":"","sources":["CTX.js"],"names":[],"mappings":"AAGO,+BAA2B;AAG3B,wCADK,OAAO,SAAS,EAAE,KAAK;;;;;;EAajC;AAGK,wCADK,OAAO,SAAS,EAAE,KAAK;;;;IAMjC,qEAAqE;yBAA1D,WAAW,OAAO,UAAU,EAAE,qBAAqB,CAAC,EAAE;IAEjE,8DAA8D;wBAAnD,OAAO,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAE1D,yEAAyE;kBAA9D,OAAO,2BAA2B,EAAE,eAAe,GAAG,IAAI;IAErE,0BAA0B;sBAAf,IAAI,MAAM,CAAC;IAEtB,8EAA8E;6BAAnE,OAAO,2BAA2B,EAAE,oBAAoB,GAAG,IAAI;;;;;;EAE1E;sBAnCoB,2BAA2B"}
+{"version":3,"file":"CTX.d.ts","sourceRoot":"","sources":["CTX.js"],"names":[],"mappings":"AAGO,+BAA2B;AAG3B,wCADK,OAAO,SAAS,EAAE,KAAK;;;;;;EAejC;AAGK,wCADK,OAAO,SAAS,EAAE,KAAK;;;;IAMjC,qEAAqE;yBAA1D,WAAW,OAAO,UAAU,EAAE,qBAAqB,CAAC,EAAE;IAEjE,8DAA8D;wBAAnD,OAAO,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAE1D,yEAAyE;kBAA9D,OAAO,2BAA2B,EAAE,eAAe,GAAG,IAAI;IAErE,0BAA0B;sBAAf,IAAI,MAAM,CAAC;IAEtB,8EAA8E;6BAAnE,OAAO,2BAA2B,EAAE,oBAAoB,GAAG,IAAI;;;;;;EAE1E;sBArCoB,2BAA2B"}

package/abstract/CTX.js

@@ -8,12 +8,14 @@ export const activityBlockCtx = (fnCtx) => ({
   ...blockCtx(),
   '*currentActivity': null,
   '*currentActivityParams': {},
+
   '*history': [],
   '*historyBack': null,
   '*closeModal': () => {
+    fnCtx.modalManager.closeAll();
+
     fnCtx.set$({
       '*currentActivity': null,
-      '*modalActive': false,
     });
   },
 });

package/abstract/ModalManager.d.ts

@@ -0,0 +1,113 @@
+/** @typedef {string} ModalId */
+/** @typedef {import('../blocks/Modal/Modal.js').Modal} ModalNode */
+export const ModalEvents: Readonly<{
+    ADD: "modal:add";
+    DELETE: "modal:delete";
+    OPEN: "modal:open";
+    CLOSE: "modal:close";
+    CLOSE_ALL: "modal:closeAll";
+    DESTROY: "modal:destroy";
+}>;
+export class ModalManager {
+    /** @param {import('./Block.js').Block} block */
+    constructor(block: import('./Block.js').Block);
+    /**
+     * @private
+     * @type {Map<ModalId, ModalNode>}
+     */
+    private _modals;
+    /**
+     * @private
+     * @type {Set<ModalId>}
+     */
+    private _activeModals;
+    _subscribers: Map<any, any>;
+    _block: import("./Block.js").Block;
+    /**
+     * @private
+     * @param {unknown[]} args
+     */
+    private _debugPrint;
+    /**
+     * Register a modal with the manager
+     *
+     * @param {ModalId} id - Unique identifier for the modal
+     * @param {ModalNode} modal - Modal component instance
+     */
+    registerModal(id: ModalId, modal: ModalNode): void;
+    /** @param {ModalId} id - Unique identifier for the modal */
+    deleteModal(id: ModalId): boolean;
+    /**
+     * Open a modal by its ID
+     *
+     * @param {ModalId} id - The ID of the modal to open
+     * @returns {boolean} - Success status
+     */
+    open(id: ModalId): boolean;
+    /**
+     * Close a specific modal by ID
+     *
+     * @param {ModalId} id - The ID of the modal to close
+     * @returns {boolean} - Success status
+     */
+    close(id: ModalId): boolean;
+    /**
+     * Toggle a modal - open if closed, close if open
+     *
+     * @param {ModalId} id - The ID of the modal to toggle
+     * @returns {boolean} - Success status
+     */
+    toggle(id: ModalId): boolean;
+    /**
+     * Check if any modals are currently active/open
+     *
+     * @returns {boolean} - True if there are any active modals
+     */
+    get hasActiveModals(): boolean;
+    /**
+     * Close the most recently opened modal and return to the previous one
+     *
+     * @returns {boolean} - Success status
+     */
+    back(): boolean;
+    /**
+     * Close all open modals
+     *
+     * @returns {number} - Number of modals closed
+     */
+    closeAll(): number;
+    /**
+     * Subscribe to modal events
+     *
+     * @param {string} event
+     * @param {() => void} callback
+     * @returns {() => void}
+     */
+    subscribe(event: string, callback: () => void): () => void;
+    /**
+     * Unsubscribe from modal events
+     *
+     * @param {string} event
+     * @param {() => void} callback
+     */
+    unsubscribe(event: string, callback: () => void): void;
+    /**
+     * Notify all subscribers of a modal event
+     *
+     * @private
+     * @param {string} event - Event name
+     * @param {{
+     *       id?: ModalId | ModalId[];
+     *       modal?: ModalNode | ModalNode[];
+     *     }
+     *   | {
+     *       modalIds: ModalId[];
+     *     }} data
+     */
+    private _notify;
+    /** Destroy the modal manager, clean up resources */
+    destroy(): void;
+}
+export type ModalId = string;
+export type ModalNode = import('../blocks/Modal/Modal.js').Modal;
+//# sourceMappingURL=ModalManager.d.ts.map

package/abstract/ModalManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModalManager.d.ts","sourceRoot":"","sources":["ModalManager.js"],"names":[],"mappings":"AAEA,gCAAgC;AAEhC,oEAAoE;AAEpE;;;;;;;GAOG;AAEH;IAeE,gDAAgD;IAChD,mBADY,OAAO,YAAY,EAAE,KAAK,EAGrC;IAjBD;;;OAGG;IACH,gBAAoB;IAEpB;;;OAGG;IACH,sBAA0B;IAE1B,4BAAyB;IAIvB,mCAAmB;IAGrB;;;OAGG;IACH,oBAEC;IAED;;;;;OAKG;IACH,kBAHW,OAAO,SACP,SAAS,QAInB;IAED,4DAA4D;IAC5D,gBADY,OAAO,WASlB;IAED;;;;;OAKG;IACH,SAHW,OAAO,GACL,OAAO,CAanB;IAED;;;;;OAKG;IACH,UAHW,OAAO,GACL,OAAO,CAanB;IAED;;;;;OAKG;IACH,WAHW,OAAO,GACL,OAAO,CAanB;IAED;;;;OAIG;IACH,+BAEC;IAED;;;;OAIG;IACH,QAFa,OAAO,CAWnB;IAED;;;;OAIG;IACH,YAFa,MAAM,CAQlB;IAED;;;;;;OAMG;IACH,iBAJW,MAAM,YACN,MAAM,IAAI,GACR,MAAM,IAAI,CAStB;IAED;;;;;OAKG;IACH,mBAHW,MAAM,YACN,MAAM,IAAI,QAMpB;IAED;;;;;;;;;;;;OAYG;IACH,gBAUC;IAED,oDAAoD;IACpD,gBAKC;CACF;sBAzNa,MAAM;wBAEN,OAAO,0BAA0B,EAAE,KAAK"}

package/abstract/ModalManager.js

@@ -0,0 +1,220 @@
+//@ts-check
+
+/** @typedef {string} ModalId */
+
+/** @typedef {import('../blocks/Modal/Modal.js').Modal} ModalNode */
+
+export const ModalEvents = Object.freeze({
+  ADD: 'modal:add',
+  DELETE: 'modal:delete',
+  OPEN: 'modal:open',
+  CLOSE: 'modal:close',
+  CLOSE_ALL: 'modal:closeAll',
+  DESTROY: 'modal:destroy',
+});
+
+export class ModalManager {
+  /**
+   * @private
+   * @type {Map<ModalId, ModalNode>}
+   */
+  _modals = new Map();
+
+  /**
+   * @private
+   * @type {Set<ModalId>}
+   */
+  _activeModals = new Set();
+
+  _subscribers = new Map();
+
+  /** @param {import('./Block.js').Block} block */
+  constructor(block) {
+    this._block = block;
+  }
+
+  /**
+   * @private
+   * @param {unknown[]} args
+   */
+  _debugPrint(...args) {
+    this._block.debugPrint('[modal-manager]', ...args);
+  }
+
+  /**
+   * Register a modal with the manager
+   *
+   * @param {ModalId} id - Unique identifier for the modal
+   * @param {ModalNode} modal - Modal component instance
+   */
+  registerModal(id, modal) {
+    this._modals.set(id, modal);
+  }
+
+  /** @param {ModalId} id - Unique identifier for the modal */
+  deleteModal(id) {
+    if (!this._modals.has(id)) return false;
+
+    const modal = this._modals.get(id);
+    this._modals.delete(id);
+    this._activeModals.delete(id);
+    this._notify(ModalEvents.DELETE, { id, modal });
+    return true;
+  }
+
+  /**
+   * Open a modal by its ID
+   *
+   * @param {ModalId} id - The ID of the modal to open
+   * @returns {boolean} - Success status
+   */
+  open(id) {
+    if (!this._modals.has(id)) {
+      this._debugPrint(`Modal with ID "${id}" not found`);
+      return false;
+    }
+
+    const modal = this._modals.get(id);
+
+    this._activeModals.add(id);
+    this._notify(ModalEvents.OPEN, { modal, id });
+    return true;
+  }
+
+  /**
+   * Close a specific modal by ID
+   *
+   * @param {ModalId} id - The ID of the modal to close
+   * @returns {boolean} - Success status
+   */
+  close(id) {
+    if (!this._modals.has(id) || !this._activeModals.has(id)) {
+      this._debugPrint(`Modal with ID "${id}" not found or not active`);
+      return false;
+    }
+
+    const modal = this._modals.get(id);
+
+    this._activeModals.delete(id);
+    this._notify(ModalEvents.CLOSE, { id, modal });
+    return true;
+  }
+
+  /**
+   * Toggle a modal - open if closed, close if open
+   *
+   * @param {ModalId} id - The ID of the modal to toggle
+   * @returns {boolean} - Success status
+   */
+  toggle(id) {
+    if (!this._modals.has(id)) {
+      this._debugPrint(`Modal with ID "${id}" not found`);
+      return false;
+    }
+
+    if (this._activeModals.has(id)) {
+      return this.close(id);
+    } else {
+      return this.open(id);
+    }
+  }
+
+  /**
+   * Check if any modals are currently active/open
+   *
+   * @returns {boolean} - True if there are any active modals
+   */
+  get hasActiveModals() {
+    return this._activeModals.size > 0;
+  }
+
+  /**
+   * Close the most recently opened modal and return to the previous one
+   *
+   * @returns {boolean} - Success status
+   */
+  back() {
+    if (this._activeModals.size === 0) {
+      this._debugPrint('No active modals to go back from');
+      return false;
+    }
+
+    // Get the last opened modal
+    const lastModalId = Array.from(this._activeModals).pop();
+    return this.close(/** @type {string} */ (lastModalId));
+  }
+
+  /**
+   * Close all open modals
+   *
+   * @returns {number} - Number of modals closed
+   */
+  closeAll() {
+    const count = this._activeModals.size;
+
+    this._activeModals.clear();
+    this._notify(ModalEvents.CLOSE_ALL, {});
+    return count;
+  }
+
+  /**
+   * Subscribe to modal events
+   *
+   * @param {string} event
+   * @param {() => void} callback
+   * @returns {() => void}
+   */
+  subscribe(event, callback) {
+    if (!this._subscribers.has(event)) {
+      this._subscribers.set(event, new Set());
+    }
+    this._subscribers.get(event).add(callback);
+
+    return () => this.unsubscribe(event, callback);
+  }
+
+  /**
+   * Unsubscribe from modal events
+   *
+   * @param {string} event
+   * @param {() => void} callback
+   */
+  unsubscribe(event, callback) {
+    if (this._subscribers.has(event)) {
+      this._subscribers.get(event).delete(callback);
+    }
+  }
+
+  /**
+   * Notify all subscribers of a modal event
+   *
+   * @private
+   * @param {string} event - Event name
+   * @param {{
+   *       id?: ModalId | ModalId[];
+   *       modal?: ModalNode | ModalNode[];
+   *     }
+   *   | {
+   *       modalIds: ModalId[];
+   *     }} data
+   */
+  _notify(event, data) {
+    if (this._subscribers.has(event)) {
+      for (const callback of this._subscribers.get(event)) {
+        try {
+          callback(data);
+        } catch (error) {
+          this._debugPrint('Error in modal subscriber:', error);
+        }
+      }
+    }
+  }
+
+  /** Destroy the modal manager, clean up resources */
+  destroy() {
+    this.closeAll();
+    this._modals.clear();
+    this._subscribers.clear();
+    this._notify(ModalEvents.DESTROY, {});
+  }
+}

package/abstract/UploaderBlock.d.ts

@@ -97,10 +97,11 @@ export namespace UploaderBlock {
         BOX: "box";
         ONEDRIVE: "onedrive";
         HUDDLE: "huddle";
+        MOBILE_VIDEO_CAMERA: "mobile-video-camera";
+        MOBILE_PHOTO_CAMERA: "mobile-photo-camera";
         LOCAL: "local";
         DROP_AREA: "drop-area";
         CAMERA: "camera";
-        VIDEO_CAMERA: "video-camera";
         EXTERNAL: "external";
         API: "js-api";
         URL: "url";

package/abstract/UploaderBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IA2BD;;;OAGG;IACH,qDAKC;IAED,mCAAmC;IACnC,6BAKC;IAED,4BAEC;IAED,iCAAiC;IACjC,wCAKC;IAYD,eAAe;IACf,qBA0BC;IAvBC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAmBH;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;;OAIG;IACH,gCAiCE;IAEF;;;OAGG;IACH,0CAyFE;IAEF,eAAe;IACf,mCAoBE;IAEF,eAAe;IACf,uBAuCC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,QAAQ,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA2BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAra6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB"}
+{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IA2BD;;;OAGG;IACH,qDAKC;IAED,mCAAmC;IACnC,6BAKC;IAED,4BAEC;IAED,iCAAiC;IACjC,wCAKC;IAYD,eAAe;IACf,qBAkBC;IAfC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAWH;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;;OAIG;IACH,gCAiCE;IAEF;;;OAGG;IACH,0CAyFE;IAEF,eAAe;IACf,mCAoBE;IAEF,eAAe;IACf,uBAwCC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,QAAQ,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA2BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA9Z6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB"}

package/abstract/UploaderBlock.js

@@ -121,14 +121,6 @@ export class UploaderBlock extends ActivityBlock {
     if (!this.$['*secureUploadsManager']) {
       this.$['*secureUploadsManager'] = new SecureUploadsManager(this);
     }
-
-    if (this.has('*modalActive')) {
-      this.sub('*modalActive', (modalActive) => {
-        if (modalActive && !this.$['*currentActivity']) {
-          this.$['*modalActive'] = false;
-        }
-      });
-    }
   }
 
   /**
@@ -364,6 +356,7 @@ export class UploaderBlock extends ActivityBlock {
           this.$['*currentActivityParams'] = {
             internalId: entry.uid,
           };
+          this.modalManager.open(ActivityBlock.activities.CLOUD_IMG_EDIT);
           this.$['*currentActivity'] = ActivityBlock.activities.CLOUD_IMG_EDIT;
         }
       }

package/abstract/UploaderPublicApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploaderPublicApi.d.ts","sourceRoot":"","sources":["UploaderPublicApi.js"],"names":[],"mappings":"AAcA;IAOE,8DAA8D;IAC9D,iBADY,OAAO,oBAAoB,EAAE,aAAa,EAGrD;IATD;;;OAGG;IACH,aAAK;IAOL,eAAe;IACf,gCAEC;IAED,yCAEC;IAED;;iBAEC;IAED;;;;;;OAMG;IACH,sBAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAUrD;IAEF;;;;OAIG;IACH,wBAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAUrD;IAEF;;;;OAIG;IACH,4BAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAgBrD;IAEF;;;;OAIG;IACH,0BAJW,IAAI;;;;;sBAEF,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAcrD;IAEF,iCAAiC;IACjC,qCADY,MAAM,UAMhB;IAEF,uBAEC;IAED,sBAeE;IAEF,8HAA8H;IAC9H,6BADY;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,qCAAqC,EAAE,cAAc,CAAA;KAAE,UAyDhH;IAEF;;;;OAIG;IACH,8EAHW,MAAM,iDA8Cf;IAEF,oEAAoE;IACpE,oKAIE;IAEF,+BAA+B;IAC/B,gDAsCE;IAEF,qBAQE;IAEF;;;;;;;;;OASG;IACH,uTAFQ,IAAI,CAWV;IAEF,2DAA2D;IAC3D,0BADc,OAAO,oBAAoB,EAAE,YAAY,CAGrD;IAEF,8BAA8B;IAC9B,wBADY,OAAO,UAOjB;IAEF;;;OAGG;IACH,0BAOC;CACF"}
+{"version":3,"file":"UploaderPublicApi.d.ts","sourceRoot":"","sources":["UploaderPublicApi.js"],"names":[],"mappings":"AAeA;IAOE,8DAA8D;IAC9D,iBADY,OAAO,oBAAoB,EAAE,aAAa,EAGrD;IATD;;;OAGG;IACH,aAAK;IAOL,eAAe;IACf,gCAEC;IAED,yCAEC;IAED;;iBAEC;IAED;;;;;;OAMG;IACH,sBAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAUrD;IAEF;;;;OAIG;IACH,wBAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAUrD;IAEF;;;;OAIG;IACH,4BAJW,MAAM;;;;sBAEJ,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAgBrD;IAEF;;;;OAIG;IACH,0BAJW,IAAI;;;;;sBAEF,OAAO,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,CAcrD;IAEF,iCAAiC;IACjC,qCADY,MAAM,UAMhB;IAEF,uBAEC;IAED,sBAeE;IAEF,8HAA8H;IAC9H,6BADY;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,qCAAqC,EAAE,cAAc,CAAA;KAAE,UAyDhH;IAEF;;;;OAIG;IACH,8EAHW,MAAM,iDA8Cf;IAEF,oEAAoE;IACpE,oKAIE;IAEF,+BAA+B;IAC/B,gDA6DE;IAEF,qBAQE;IAEF;;;;;;;;;OASG;IACH,uTAFQ,IAAI,CAWV;IAEF,2DAA2D;IAC3D,0BADc,OAAO,oBAAoB,EAAE,YAAY,CAGrD;IAEF,8BAA8B;IAC9B,wBADY,OAAO,UAYjB;IAEF;;;OAGG;IACH,0BAOC;CACF"}

package/abstract/UploaderPublicApi.js

@@ -11,6 +11,7 @@ import { buildOutputCollectionState } from './buildOutputCollectionState.js';
 import { stringToArray } from '../utils/stringToArray.js';
 import { calcCameraModes } from '../blocks/CameraSource/calcCameraModes.js';
 import { CameraSourceTypes } from '../blocks/CameraSource/constants.js';
+import { isSupportCapture } from '../blocks/utils/supportCapture.js';
 
 export class UploaderPublicApi {
   /**
@@ -160,10 +161,10 @@ export class UploaderPublicApi {
 
       if (options.modeCamera === CameraSourceTypes.PHOTO && isPhotoEnabled) {
         fileInput.accept = 'image/*';
-      }
-
-      if (options.modeCamera === CameraSourceTypes.VIDEO && isVideoRecordingEnabled) {
+      } else if (options.modeCamera === CameraSourceTypes.VIDEO && isVideoRecordingEnabled) {
         fileInput.accept = 'video/*';
+      } else {
+        fileInput.accept = ['image/*', isVideoRecordingEnabled && 'video/*'].filter(Boolean).join(',');
       }
     } else {
       fileInput.accept = accept;
@@ -178,8 +179,8 @@ export class UploaderPublicApi {
           this.addFileFromObject(file, { source: options.captureCamera ? UploadSource.CAMERA : UploadSource.LOCAL }),
         );
         // To call uploadTrigger UploadList should draw file items first:
+        this._ctx.modalManager.open(ActivityBlock.activities.UPLOAD_LIST);
         this._ctx.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
-        this._ctx.setOrAddState('*modalActive', true);
         fileInput.remove();
       },
       {
@@ -257,10 +258,10 @@ export class UploaderPublicApi {
   /** @param {Boolean} [force] */
   initFlow = (force = false) => {
     if (this._uploadCollection.size > 0 && !force) {
+      this._ctx.modalManager?.open(ActivityBlock.activities.UPLOAD_LIST);
       this._ctx.set$({
         '*currentActivity': ActivityBlock.activities.UPLOAD_LIST,
       });
-      this._ctx.setOrAddState('*modalActive', true);
     } else {
       if (this._sourceList?.length === 1) {
         const srcKey = this._sourceList[0];
@@ -272,6 +273,28 @@ export class UploaderPublicApi {
           return;
         }
 
+        if (srcKey === 'camera' && isSupportCapture()) {
+          const { isPhotoEnabled, isVideoRecordingEnabled } = calcCameraModes(this.cfg);
+
+          if (isPhotoEnabled && isVideoRecordingEnabled) {
+            this._ctx.set$({
+              '*currentActivity': ActivityBlock.activities.START_FROM,
+            });
+            return;
+          } else if (isPhotoEnabled || isVideoRecordingEnabled) {
+            this.openSystemDialog({
+              captureCamera: true,
+              modeCamera: isPhotoEnabled ? CameraSourceTypes.PHOTO : CameraSourceTypes.VIDEO,
+            });
+            return;
+          } else {
+            this.openSystemDialog({
+              captureCamera: true,
+              modeCamera: CameraSourceTypes.PHOTO,
+            });
+          }
+        }
+
         /** @type {Set<import('./Block').Block>} */
         const blocksRegistry = this._ctx.$['*blocksRegistry'];
         /**
@@ -282,15 +305,16 @@ export class UploaderPublicApi {
         const sourceBtnBlock = [...blocksRegistry].find(isSourceBtn);
         // TODO: This is weird that we have this logic inside UI component, we should consider to move it somewhere else
         sourceBtnBlock?.activate();
+
         if (this._ctx.$['*currentActivity']) {
-          this._ctx.setOrAddState('*modalActive', true);
+          this._ctx.modalManager?.open(this._ctx.$['*currentActivity']);
         }
       } else {
         // Multiple sources case:
+        this._ctx.modalManager?.open(ActivityBlock.activities.START_FROM);
         this._ctx.set$({
           '*currentActivity': ActivityBlock.activities.START_FROM,
         });
-        this._ctx.setOrAddState('*modalActive', true);
       }
     }
   };
@@ -301,7 +325,7 @@ export class UploaderPublicApi {
       '*history': this._ctx.doneActivity ? [this._ctx.doneActivity] : [],
     });
     if (!this._ctx.$['*currentActivity']) {
-      this._ctx.setOrAddState('*modalActive', false);
+      this._ctx.modalManager.closeAll();
     }
   };
 
@@ -337,7 +361,12 @@ export class UploaderPublicApi {
       console.warn(`Can't open modal without current activity. Please use "setCurrentActivity" method first.`);
       return;
     }
-    this._ctx.setOrAddState('*modalActive', opened);
+
+    if (opened) {
+      this._ctx.modalManager?.open(this._ctx.$['*currentActivity']);
+    } else {
+      this._ctx.modalManager?.close(this._ctx.$['*currentActivity']);
+    }
   };
 
   /**

package/blocks/CameraSource/CameraSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CameraSource.d.ts","sourceRoot":"","sources":["CameraSource.js"],"names":[],"mappings":"AAyCA,8CAA8C;AAE9C,kGAAkG;AAElG;IAEE,uBAA+C;IAE/C,eAAe;IACf,0BAAyB;IAEzB,yBAAyB;IACzB,SADW,QAAQ,EAAE,CACR;IAEb,mCAAmC;IACnC,gBADW,aAAa,GAAG,IAAI,CACT;IAEtB,iCAAiC;IACjC,SADW,WAAW,GAAG,IAAI,CACd;IAEf,4BAA4B;IAC5B,kBADW,MAAM,GAAG,IAAI,CACA;IAExB,4BAA4B;IAC5B,mBADW,MAAM,GAAG,IAAI,CACC;IAKvB;;;;;;;;;;;;;;;;;;;;;;;;QAiCE,qBAAqB;;QAErB,qBAAqB;;;;QAMrB,uBAAuB;kCAAX,KAAK;QAMjB,uBAAuB;iCAAX,KAAK;;;;QAcjB,iDAAiD;;;;;;;;QAejD,4BAA4B;wBAAhB,UAAU;;;;;;;;;;;;;;MAKvB;IAGH,oCAaE;IAEF,yBAkBE;IADA,sCAAiE;IAGnE,wBAKE;IAEF,uBAEE;IAEF,2BAOE;IAEF,0BAEE;IAEF,4BAiCE;IA9BE;;;;;kBAEC;IA8BL,eAAe;IACf,uBAWE;IAEF,2DAA2D;IAC3D,6BAQE;IAEF,+BAOE;IAEF;;;;OAIG;IACH,sBA6BE;IAEF,oBAUE;IAEF,oBAoBE;IAEF,mCAAmC;IACnC,uBADY,YAAY,UAqBtB;IAEF,mCAAmC;IACnC,uBADY,YAAY,UAwCtB;IAEF;;;OAGG;IACH,wBAmBE;IAEF,eAAe;IACf,cAoBC;IAjBC,uCAA+C;IAC/C,kDAAyC;IAkB3C;;;OAGG;IACH,yBAwBE;IADA,mCAAuB;IAGzB;;;;;OAKG;IACH,oBALW,QAAQ,GAAG,OAAO,OAClB,MAAM,GAAG,MAAM,wBAEf,IAAI,UAYb;IAEF,uCAAuC;IACvC,4BADY,SAAS,SAAS,OAmC7B;IAED;;;;OAIG;IACH,gBAFW,IAAI,UAOb;IAEF,eAAe;IACf,2BAEC;IAED;;;OAGG;IACH,6BA+CQ;IAER,6CAQE;IAEF,yBAWE;IAFE,gCAAuB;IAI3B,8BAyCE;IAEF,qCAEE;IAEF,uCAYE;IAEF,2BAA0B;IAE1B,0CASE;IAEF,iCAsCE;IAlCE;;;oBAKK;IAEL;;;oBAOO;IAsBX,iCAME;IAEF,mCAYE;IAEF,wCAAwC;IACxC,kCADY,UAAU,EAAE,UAStB;IAyBF,iBAMC;IAED,iCAIC;CACF;;;;yBAjxBa,OAAO,GAAG,OAAO;2BAEjB,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ;8BAzCnD,iCAAiC"}
+{"version":3,"file":"CameraSource.d.ts","sourceRoot":"","sources":["CameraSource.js"],"names":[],"mappings":"AAyCA,8CAA8C;AAE9C,kGAAkG;AAElG;IAEE,uBAA+C;IAE/C,eAAe;IACf,0BAAyB;IAEzB,yBAAyB;IACzB,SADW,QAAQ,EAAE,CACR;IAEb,mCAAmC;IACnC,gBADW,aAAa,GAAG,IAAI,CACT;IAEtB,iCAAiC;IACjC,SADW,WAAW,GAAG,IAAI,CACd;IAEf,4BAA4B;IAC5B,kBADW,MAAM,GAAG,IAAI,CACA;IAExB,4BAA4B;IAC5B,mBADW,MAAM,GAAG,IAAI,CACC;IAKvB;;;;;;;;;;;;;;;;;;;;;;;;QAiCE,qBAAqB;;QAErB,qBAAqB;;;;QAMrB,uBAAuB;kCAAX,KAAK;QAMjB,uBAAuB;iCAAX,KAAK;;;;QAcjB,iDAAiD;;;;;;;;QAejD,4BAA4B;wBAAhB,UAAU;;;;;;;;;;;;;;MAKvB;IAGH,oCAaE;IAEF,yBAkBE;IADA,sCAAiE;IAGnE,wBAKE;IAEF,uBAEE;IAEF,2BAOE;IAEF,0BAEE;IAEF,4BAiCE;IA9BE;;;;;kBAEC;IA8BL,eAAe;IACf,uBAWE;IAEF,2DAA2D;IAC3D,6BAQE;IAEF,+BAOE;IAEF;;;;OAIG;IACH,sBA6BE;IAEF,oBAUE;IAEF,oBAoBE;IAEF,mCAAmC;IACnC,uBADY,YAAY,UAqBtB;IAEF,mCAAmC;IACnC,uBADY,YAAY,UAwCtB;IAEF;;;OAGG;IACH,wBAmBE;IAEF,eAAe;IACf,cAoBC;IAjBC,uCAA+C;IAC/C,kDAAyC;IAkB3C;;;OAGG;IACH,yBAwBE;IADA,mCAAuB;IAGzB;;;;;OAKG;IACH,oBALW,QAAQ,GAAG,OAAO,OAClB,MAAM,GAAG,MAAM,wBAEf,IAAI,UAYb;IAEF,uCAAuC;IACvC,4BADY,SAAS,SAAS,OAmC7B;IAED;;;;OAIG;IACH,gBAFW,IAAI,UAQb;IAEF,eAAe;IACf,2BAEC;IAED;;;OAGG;IACH,6BA+CQ;IAER,6CAQE;IAEF,yBAWE;IAFE,gCAAuB;IAI3B,8BAyCE;IAEF,qCAEE;IAEF,uCAYE;IAEF,2BAA0B;IAE1B,0CASE;IAEF,iCAsCE;IAlCE;;;oBAKK;IAEL;;;oBAOO;IAsBX,iCAME;IAEF,mCAYE;IAEF,wCAAwC;IACxC,kCADY,UAAU,EAAE,UAStB;IAyBF,iBAMC;IAED,iCAIC;CACF;;;;yBAlxBa,OAAO,GAAG,OAAO;2BAEjB,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ;8BAzCnD,iCAAiC"}