@4i/modal-manager 1.0.73 → 1.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4i/modal-manager",
-  "version": "1.0.73",
+  "version": "1.0.80",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

package/src/utils/ModalManager.d.ts

@@ -1,7 +1,18 @@
 import Manager from "./Manager";
+interface QueueState {
+    queue: string[];
+    closedModalName?: string | undefined;
+    lastOpenedModal?: string | undefined;
+}
+interface ModalState {
+    isHaveOpenModals: boolean;
+    queue: string[];
+    closedModalName?: string | undefined;
+    lastOpenedModal?: string | undefined;
+}
 export declare class ModalManager extends Manager {
     queue: string[];
-    _openModalStateCallback: null | ((state: boolean) => void);
+    _openModalStateCallback: null | ((props: ModalState) => void);
     constructor();
     create<T>(name: string, payload: {
         modalId: number;
@@ -9,8 +20,13 @@ export declare class ModalManager extends Manager {
     }): void;
     call<T>(name: string, data?: T): void;
     close<T>(position?: T): void;
-    getQueueState(): boolean;
-    onOpenModalState(callback: (state: boolean) => void): void;
+    getQueueState({ queue, closedModalName, lastOpenedModal }: QueueState): {
+        isHaveOpenModals: boolean;
+        queue: string[];
+        lastOpenedModal: string | undefined;
+        closedModalName: string | undefined;
+    };
+    onOpenModalState(callback: (state: ModalState) => void): void;
 }
 declare const modal: ModalManager;
 export default modal;

package/src/utils/ModalManager.js

@@ -44,19 +44,33 @@ var ModalManager = /** @class */ (function (_super) {
         this.emitter.emit(constants.CHANGE, this.name, this.data);
     };
     ModalManager.prototype.call = function (name, data) {
+        var _a;
         this.create(name, { modalId: uniqueID(), data: data });
+        var lastOpenedModal = name;
         this.queue.push(name);
-        this._openModalStateCallback &&
-            this._openModalStateCallback(this.getQueueState());
+        (_a = this._openModalStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, this.getQueueState({
+            queue: this.queue,
+            lastOpenedModal: lastOpenedModal,
+        }));
     };
     ModalManager.prototype.close = function (position) {
+        var _a;
         this.emitter.emit(constants.CLOSE, position);
+        var closedModalName = this.queue[this.queue.length - 1];
         this.queue.pop();
-        this._openModalStateCallback &&
-            this._openModalStateCallback(this.getQueueState());
+        (_a = this._openModalStateCallback) === null || _a === void 0 ? void 0 : _a.call(this, this.getQueueState({
+            queue: this.queue,
+            closedModalName: closedModalName,
+        }));
     };
-    ModalManager.prototype.getQueueState = function () {
-        return this.queue.length > 0;
+    ModalManager.prototype.getQueueState = function (_a) {
+        var queue = _a.queue, closedModalName = _a.closedModalName, lastOpenedModal = _a.lastOpenedModal;
+        return {
+            isHaveOpenModals: queue.length > 0,
+            queue: queue,
+            lastOpenedModal: lastOpenedModal,
+            closedModalName: closedModalName,
+        };
     };
     ModalManager.prototype.onOpenModalState = function (callback) {
         this._openModalStateCallback = callback;

package/src/utils/ModalManager.ts

@@ -9,9 +9,22 @@ const constants = {
   CLOSE: "close",
 };
 
+interface QueueState {
+  queue: string[];
+  closedModalName?: string | undefined;
+  lastOpenedModal?: string | undefined;
+}
+
+interface ModalState {
+  isHaveOpenModals: boolean;
+  queue: string[];
+  closedModalName?: string | undefined;
+  lastOpenedModal?: string | undefined;
+}
+
 export class ModalManager extends Manager {
   queue: string[] = [];
-  _openModalStateCallback: null | ((state: boolean) => void);
+  _openModalStateCallback: null | ((props: ModalState) => void);
 
   constructor() {
     super();
@@ -29,23 +42,40 @@ export class ModalManager extends Manager {
 
   call<T>(name: string, data?: T) {
     this.create<T>(name, { modalId: uniqueID(), data });
+    const lastOpenedModal = name;
     this.queue.push(name);
-    this._openModalStateCallback &&
-      this._openModalStateCallback(this.getQueueState());
+
+    this._openModalStateCallback?.(
+      this.getQueueState({
+        queue: this.queue,
+        lastOpenedModal,
+      })
+    );
   }
 
   close<T>(position?: T) {
     this.emitter.emit(constants.CLOSE, position);
+    const closedModalName = this.queue[this.queue.length - 1];
     this.queue.pop();
-    this._openModalStateCallback &&
-      this._openModalStateCallback(this.getQueueState());
+
+    this._openModalStateCallback?.(
+      this.getQueueState({
+        queue: this.queue,
+        closedModalName,
+      })
+    );
   }
 
-  getQueueState() {
-    return this.queue.length > 0;
+  getQueueState({ queue, closedModalName, lastOpenedModal }: QueueState) {
+    return {
+      isHaveOpenModals: queue.length > 0,
+      queue,
+      lastOpenedModal: lastOpenedModal,
+      closedModalName,
+    };
   }
 
-  onOpenModalState(callback: (state: boolean) => void) {
+  onOpenModalState(callback: (state: ModalState) => void) {
     this._openModalStateCallback = callback;
   }
 }