survey-angular-ui 2.5.7 → 2.5.8

package/components/popup/modal-container.component.d.ts

@@ -1,13 +1,13 @@
-import { IDialogOptions, PopupBaseViewModel } from "survey-core";
+import { PopupModalManager } from "survey-core";
 import { PopupService } from "./popup.service";
 import * as i0 from "@angular/core";
 export declare class ModalComponent {
     private popupService;
-    model: PopupBaseViewModel;
-    private portalHost;
     private functionDefined;
+    private hosts;
+    private modalManager;
     constructor(popupService: PopupService);
-    showDialog(dialogOptions: IDialogOptions, rootElement?: HTMLElement): PopupBaseViewModel;
+    createModalManager(): PopupModalManager;
     ngOnInit(): void;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModalComponent, never>;

package/esm2015/components/popup/modal-container.component.js

@@ -1,35 +1,35 @@
 import { Component } from "@angular/core";
-import { createPopupModalViewModel, settings } from "survey-core";
+import { PopupModalManager, settings } from "survey-core";
 import * as i0 from "@angular/core";
 import * as i1 from "./popup.service";
 export class ModalComponent {
     constructor(popupService) {
         this.popupService = popupService;
         this.functionDefined = false;
+        this.hosts = {};
+        this.modalManager = this.createModalManager();
     }
-    showDialog(dialogOptions, rootElement) {
-        const popupViewModel = this.model = createPopupModalViewModel(dialogOptions, rootElement);
-        const onVisibilityChangedCallback = (_, options) => {
-            if (!options.isVisible) {
-                this.portalHost.detach();
-                this.model.dispose();
+    createModalManager() {
+        const modalManager = new PopupModalManager();
+        modalManager.onModalsChangedCallback = (_, addedModals, removedModals) => {
+            for (const modal of addedModals) {
+                this.hosts[modal.uniqueId] = this.popupService.createComponent(modal);
+            }
+            for (const modal of removedModals) {
+                if (this.hosts[modal.uniqueId]) {
+                    this.hosts[modal.uniqueId].detach();
+                    delete this.hosts[modal.uniqueId];
+                }
             }
         };
-        popupViewModel.onVisibilityChanged.add(onVisibilityChangedCallback);
-        this.portalHost = this.popupService.createComponent(this.model);
-        this.model.model.isVisible = true;
-        return this.model;
+        return modalManager;
     }
     ngOnInit() {
         this.functionDefined = true;
-        settings.showDialog = (dialogOptions, rootElement) => {
-            return this.showDialog(dialogOptions, rootElement);
-        };
+        settings.showDialog = (dialogOptions, rootElement) => this.modalManager.addDialog(dialogOptions, rootElement);
     }
     ngOnDestroy() {
-        var _a, _b;
-        (_a = this.portalHost) === null || _a === void 0 ? void 0 : _a.detach();
-        (_b = this.model) === null || _b === void 0 ? void 0 : _b.dispose();
+        this.modalManager.clear();
         if (this.functionDefined) {
             settings.showDialog = undefined;
         }
@@ -45,4 +45,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
                     styleUrls: ["../../hide-host.scss"]
                 }]
         }], ctorParameters: function () { return [{ type: i1.PopupService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kYWwtY29udGFpbmVyLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL3BvcHVwL21vZGFsLWNvbnRhaW5lci5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQXNDLHlCQUF5QixFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQzs7O0FBU3RHLE1BQU0sT0FBTyxjQUFjO0lBTXpCLFlBQW9CLFlBQTBCO1FBQTFCLGlCQUFZLEdBQVosWUFBWSxDQUFjO1FBRnRDLG9CQUFlLEdBQVksS0FBSyxDQUFDO0lBR3pDLENBQUM7SUFDRCxVQUFVLENBQUMsYUFBNkIsRUFBRSxXQUF5QjtRQUNqRSxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsS0FBSyxHQUFHLHlCQUF5QixDQUFDLGFBQWEsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUMxRixNQUFNLDJCQUEyQixHQUFHLENBQUMsQ0FBcUIsRUFBRSxPQUErQixFQUFFLEVBQUU7WUFDN0YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUU7Z0JBQ3RCLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3pCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7YUFDdEI7UUFDSCxDQUFDLENBQUM7UUFDRixjQUFjLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLDJCQUEyQixDQUFDLENBQUM7UUFDcEUsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDaEUsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQztRQUNsQyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUNELFFBQVE7UUFDTixJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQztRQUU1QixRQUFRLENBQUMsVUFBVSxHQUFHLENBQUMsYUFBNkIsRUFBRSxXQUF5QixFQUFFLEVBQUU7WUFDakYsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLGFBQWEsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUNyRCxDQUFDLENBQUM7SUFDSixDQUFDO0lBQ0QsV0FBVzs7UUFDVCxNQUFBLElBQUksQ0FBQyxVQUFVLDBDQUFFLE1BQU0sRUFBRSxDQUFDO1FBQzFCLE1BQUEsSUFBSSxDQUFDLEtBQUssMENBQUUsT0FBTyxFQUFFLENBQUM7UUFDdEIsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFO1lBQ3hCLFFBQVEsQ0FBQyxVQUFVLEdBQVEsU0FBUyxDQUFDO1NBQ3RDO0lBQ0gsQ0FBQzs7NEdBbENVLGNBQWM7Z0dBQWQsY0FBYyw2REFKZixFQUFFOzRGQUlELGNBQWM7a0JBTjFCLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLHVCQUF1QjtvQkFDakMsUUFBUSxFQUFFLEVBQUU7b0JBQ1osU0FBUyxFQUFFLENBQUMsc0JBQXNCLENBQUM7aUJBQ3BDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRG9tUG9ydGFsT3V0bGV0IH0gZnJvbSBcIkBhbmd1bGFyL2Nkay9wb3J0YWxcIjtcbmltcG9ydCB7IENvbXBvbmVudCB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XG5pbXBvcnQgeyBJRGlhbG9nT3B0aW9ucywgUG9wdXBCYXNlVmlld01vZGVsLCBjcmVhdGVQb3B1cE1vZGFsVmlld01vZGVsLCBzZXR0aW5ncyB9IGZyb20gXCJzdXJ2ZXktY29yZVwiO1xuaW1wb3J0IHsgUG9wdXBTZXJ2aWNlIH0gZnJvbSBcIi4vcG9wdXAuc2VydmljZVwiO1xuXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6IFwic3YtbmctbW9kYWwtY29udGFpbmVyXCIsXG4gIHRlbXBsYXRlOiBcIlwiLFxuICBzdHlsZVVybHM6IFtcIi4uLy4uL2hpZGUtaG9zdC5zY3NzXCJdXG59KVxuXG5leHBvcnQgY2xhc3MgTW9kYWxDb21wb25lbnQge1xuXG4gIHB1YmxpYyBtb2RlbCE6IFBvcHVwQmFzZVZpZXdNb2RlbDtcbiAgcHJpdmF0ZSBwb3J0YWxIb3N0ITogRG9tUG9ydGFsT3V0bGV0O1xuICBwcml2YXRlIGZ1bmN0aW9uRGVmaW5lZDogYm9vbGVhbiA9IGZhbHNlO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcG9wdXBTZXJ2aWNlOiBQb3B1cFNlcnZpY2UpIHtcbiAgfVxuICBzaG93RGlhbG9nKGRpYWxvZ09wdGlvbnM6IElEaWFsb2dPcHRpb25zLCByb290RWxlbWVudD86IEhUTUxFbGVtZW50KTogUG9wdXBCYXNlVmlld01vZGVsIHtcbiAgICBjb25zdCBwb3B1cFZpZXdNb2RlbCA9IHRoaXMubW9kZWwgPSBjcmVhdGVQb3B1cE1vZGFsVmlld01vZGVsKGRpYWxvZ09wdGlvbnMsIHJvb3RFbGVtZW50KTtcbiAgICBjb25zdCBvblZpc2liaWxpdHlDaGFuZ2VkQ2FsbGJhY2sgPSAoXzogUG9wdXBCYXNlVmlld01vZGVsLCBvcHRpb25zOiB7IGlzVmlzaWJsZTogYm9vbGVhbiB9KSA9PiB7XG4gICAgICBpZiAoIW9wdGlvbnMuaXNWaXNpYmxlKSB7XG4gICAgICAgIHRoaXMucG9ydGFsSG9zdC5kZXRhY2goKTtcbiAgICAgICAgdGhpcy5tb2RlbC5kaXNwb3NlKCk7XG4gICAgICB9XG4gICAgfTtcbiAgICBwb3B1cFZpZXdNb2RlbC5vblZpc2liaWxpdHlDaGFuZ2VkLmFkZChvblZpc2liaWxpdHlDaGFuZ2VkQ2FsbGJhY2spO1xuICAgIHRoaXMucG9ydGFsSG9zdCA9IHRoaXMucG9wdXBTZXJ2aWNlLmNyZWF0ZUNvbXBvbmVudCh0aGlzLm1vZGVsKTtcbiAgICB0aGlzLm1vZGVsLm1vZGVsLmlzVmlzaWJsZSA9IHRydWU7XG4gICAgcmV0dXJuIHRoaXMubW9kZWw7XG4gIH1cbiAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgdGhpcy5mdW5jdGlvbkRlZmluZWQgPSB0cnVlO1xuXG4gICAgc2V0dGluZ3Muc2hvd0RpYWxvZyA9IChkaWFsb2dPcHRpb25zOiBJRGlhbG9nT3B0aW9ucywgcm9vdEVsZW1lbnQ/OiBIVE1MRWxlbWVudCkgPT4ge1xuICAgICAgcmV0dXJuIHRoaXMuc2hvd0RpYWxvZyhkaWFsb2dPcHRpb25zLCByb290RWxlbWVudCk7XG4gICAgfTtcbiAgfVxuICBuZ09uRGVzdHJveSgpIHtcbiAgICB0aGlzLnBvcnRhbEhvc3Q/LmRldGFjaCgpO1xuICAgIHRoaXMubW9kZWw/LmRpc3Bvc2UoKTtcbiAgICBpZiAodGhpcy5mdW5jdGlvbkRlZmluZWQpIHtcbiAgICAgIHNldHRpbmdzLnNob3dEaWFsb2cgPSA8YW55PnVuZGVmaW5lZDtcbiAgICB9XG4gIH1cbn1cblxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kYWwtY29udGFpbmVyLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb21wb25lbnRzL3BvcHVwL21vZGFsLWNvbnRhaW5lci5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQXNDLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQzs7O0FBYzlGLE1BQU0sT0FBTyxjQUFjO0lBSXpCLFlBQW9CLFlBQTBCO1FBQTFCLGlCQUFZLEdBQVosWUFBWSxDQUFjO1FBSHRDLG9CQUFlLEdBQVksS0FBSyxDQUFDO1FBQ2pDLFVBQUssR0FBeUMsRUFBRSxDQUFDO1FBQ2pELGlCQUFZLEdBQXNCLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO0lBRXBFLENBQUM7SUFDRCxrQkFBa0I7UUFDaEIsTUFBTSxZQUFZLEdBQUcsSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1FBQzdDLFlBQVksQ0FBQyx1QkFBdUIsR0FBRyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLEVBQUU7WUFDdkUsS0FBSyxNQUFNLEtBQUssSUFBSSxXQUFXLEVBQUU7Z0JBQy9CLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO2FBQ3ZFO1lBQ0QsS0FBSyxNQUFNLEtBQUssSUFBSSxhQUFhLEVBQUU7Z0JBQ2pDLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEVBQUU7b0JBQzlCLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO29CQUNwQyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO2lCQUNuQzthQUNGO1FBQ0gsQ0FBQyxDQUFDO1FBQ0YsT0FBTyxZQUFZLENBQUM7SUFDdEIsQ0FBQztJQUNELFFBQVE7UUFDTixJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQztRQUM1QixRQUFRLENBQUMsVUFBVSxHQUFHLENBQUMsYUFBNkIsRUFBRSxXQUF5QixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDOUksQ0FBQztJQUNELFdBQVc7UUFDVCxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFCLElBQUksSUFBSSxDQUFDLGVBQWUsRUFBRTtZQUN4QixRQUFRLENBQUMsVUFBVSxHQUFRLFNBQVMsQ0FBQztTQUN0QztJQUNILENBQUM7OzRHQTlCVSxjQUFjO2dHQUFkLGNBQWMsNkRBSmYsRUFBRTs0RkFJRCxjQUFjO2tCQU4xQixTQUFTO21CQUFDO29CQUNULFFBQVEsRUFBRSx1QkFBdUI7b0JBQ2pDLFFBQVEsRUFBRSxFQUFFO29CQUNaLFNBQVMsRUFBRSxDQUFDLHNCQUFzQixDQUFDO2lCQUNwQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERvbVBvcnRhbE91dGxldCB9IGZyb20gXCJAYW5ndWxhci9jZGsvcG9ydGFsXCI7XG5pbXBvcnQgeyBDb21wb25lbnQgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xuaW1wb3J0IHsgSURpYWxvZ09wdGlvbnMsIFBvcHVwQmFzZVZpZXdNb2RlbCwgUG9wdXBNb2RhbE1hbmFnZXIsIHNldHRpbmdzIH0gZnJvbSBcInN1cnZleS1jb3JlXCI7XG5pbXBvcnQgeyBQb3B1cFNlcnZpY2UgfSBmcm9tIFwiLi9wb3B1cC5zZXJ2aWNlXCI7XG5cbmludGVyZmFjZSBJTW9kYWxXaW5kb3dEZXNjcmlwdG9yIHtcbiAgbW9kZWw6IFBvcHVwQmFzZVZpZXdNb2RlbDtcbiAgcG9ydGFsSG9zdDogRG9tUG9ydGFsT3V0bGV0O1xufVxuXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6IFwic3YtbmctbW9kYWwtY29udGFpbmVyXCIsXG4gIHRlbXBsYXRlOiBcIlwiLFxuICBzdHlsZVVybHM6IFtcIi4uLy4uL2hpZGUtaG9zdC5zY3NzXCJdXG59KVxuXG5leHBvcnQgY2xhc3MgTW9kYWxDb21wb25lbnQge1xuICBwcml2YXRlIGZ1bmN0aW9uRGVmaW5lZDogYm9vbGVhbiA9IGZhbHNlO1xuICBwcml2YXRlIGhvc3RzOiB7IFtpbmRleDogbnVtYmVyXTogRG9tUG9ydGFsT3V0bGV0IH0gPSB7fTtcbiAgcHJpdmF0ZSBtb2RhbE1hbmFnZXI6IFBvcHVwTW9kYWxNYW5hZ2VyID0gdGhpcy5jcmVhdGVNb2RhbE1hbmFnZXIoKTtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBwb3B1cFNlcnZpY2U6IFBvcHVwU2VydmljZSkge1xuICB9XG4gIGNyZWF0ZU1vZGFsTWFuYWdlcigpOiBQb3B1cE1vZGFsTWFuYWdlciB7XG4gICAgY29uc3QgbW9kYWxNYW5hZ2VyID0gbmV3IFBvcHVwTW9kYWxNYW5hZ2VyKCk7XG4gICAgbW9kYWxNYW5hZ2VyLm9uTW9kYWxzQ2hhbmdlZENhbGxiYWNrID0gKF8sIGFkZGVkTW9kYWxzLCByZW1vdmVkTW9kYWxzKSA9PiB7XG4gICAgICBmb3IgKGNvbnN0IG1vZGFsIG9mIGFkZGVkTW9kYWxzKSB7XG4gICAgICAgIHRoaXMuaG9zdHNbbW9kYWwudW5pcXVlSWRdID0gdGhpcy5wb3B1cFNlcnZpY2UuY3JlYXRlQ29tcG9uZW50KG1vZGFsKTtcbiAgICAgIH1cbiAgICAgIGZvciAoY29uc3QgbW9kYWwgb2YgcmVtb3ZlZE1vZGFscykge1xuICAgICAgICBpZiAodGhpcy5ob3N0c1ttb2RhbC51bmlxdWVJZF0pIHtcbiAgICAgICAgICB0aGlzLmhvc3RzW21vZGFsLnVuaXF1ZUlkXS5kZXRhY2goKTtcbiAgICAgICAgICBkZWxldGUgdGhpcy5ob3N0c1ttb2RhbC51bmlxdWVJZF07XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9O1xuICAgIHJldHVybiBtb2RhbE1hbmFnZXI7XG4gIH1cbiAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgdGhpcy5mdW5jdGlvbkRlZmluZWQgPSB0cnVlO1xuICAgIHNldHRpbmdzLnNob3dEaWFsb2cgPSAoZGlhbG9nT3B0aW9uczogSURpYWxvZ09wdGlvbnMsIHJvb3RFbGVtZW50PzogSFRNTEVsZW1lbnQpID0+IHRoaXMubW9kYWxNYW5hZ2VyLmFkZERpYWxvZyhkaWFsb2dPcHRpb25zLCByb290RWxlbWVudCk7XG4gIH1cbiAgbmdPbkRlc3Ryb3koKSB7XG4gICAgdGhpcy5tb2RhbE1hbmFnZXIuY2xlYXIoKTtcbiAgICBpZiAodGhpcy5mdW5jdGlvbkRlZmluZWQpIHtcbiAgICAgIHNldHRpbmdzLnNob3dEaWFsb2cgPSA8YW55PnVuZGVmaW5lZDtcbiAgICB9XG4gIH1cbn1cblxuIl19

package/fesm2015/survey-angular-ui.js

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { TemplateRef, Component, ViewChild, Directive, Input, VERSION, Injectable, HostBinding, Pipe, ElementRef, HostListener, ViewContainerRef, NgModule } from '@angular/core';
 import * as Survey from 'survey-core';
-import { createPopupModalViewModel, settings, ScrollViewModel, SvgRegistry, addIconsToThemeSet, PopupSurveyModel, LocalizableString, createPopupViewModel, Helpers, DropdownMultiSelectListModel, RendererFactory, ButtonGroupItemModel, doKey2ClickUp, doKey2ClickDown, doKey2ClickBlur, ActionDropdownViewModel, SurveyProgressModel, ProgressButtonsResponsivityManager, SurveyModel } from 'survey-core';
+import { PopupModalManager, settings, ScrollViewModel, SvgRegistry, addIconsToThemeSet, PopupSurveyModel, LocalizableString, createPopupViewModel, Helpers, DropdownMultiSelectListModel, RendererFactory, ButtonGroupItemModel, doKey2ClickUp, doKey2ClickDown, doKey2ClickBlur, ActionDropdownViewModel, SurveyProgressModel, ProgressButtonsResponsivityManager, SurveyModel } from 'survey-core';
 import { icons } from 'survey-core/icons/iconsV1';
 import { icons as icons$1 } from 'survey-core/icons/iconsV2';
 import { DomPortalOutlet, ComponentPortal } from '@angular/cdk/portal';
@@ -456,30 +456,30 @@ class ModalComponent {
     constructor(popupService) {
         this.popupService = popupService;
         this.functionDefined = false;
-    }
-    showDialog(dialogOptions, rootElement) {
-        const popupViewModel = this.model = createPopupModalViewModel(dialogOptions, rootElement);
-        const onVisibilityChangedCallback = (_, options) => {
-            if (!options.isVisible) {
-                this.portalHost.detach();
-                this.model.dispose();
+        this.hosts = {};
+        this.modalManager = this.createModalManager();
+    }
+    createModalManager() {
+        const modalManager = new PopupModalManager();
+        modalManager.onModalsChangedCallback = (_, addedModals, removedModals) => {
+            for (const modal of addedModals) {
+                this.hosts[modal.uniqueId] = this.popupService.createComponent(modal);
+            }
+            for (const modal of removedModals) {
+                if (this.hosts[modal.uniqueId]) {
+                    this.hosts[modal.uniqueId].detach();
+                    delete this.hosts[modal.uniqueId];
+                }
             }
         };
-        popupViewModel.onVisibilityChanged.add(onVisibilityChangedCallback);
-        this.portalHost = this.popupService.createComponent(this.model);
-        this.model.model.isVisible = true;
-        return this.model;
+        return modalManager;
     }
     ngOnInit() {
         this.functionDefined = true;
-        settings.showDialog = (dialogOptions, rootElement) => {
-            return this.showDialog(dialogOptions, rootElement);
-        };
+        settings.showDialog = (dialogOptions, rootElement) => this.modalManager.addDialog(dialogOptions, rootElement);
     }
     ngOnDestroy() {
-        var _a, _b;
-        (_a = this.portalHost) === null || _a === void 0 ? void 0 : _a.detach();
-        (_b = this.model) === null || _b === void 0 ? void 0 : _b.dispose();
+        this.modalManager.clear();
         if (this.functionDefined) {
             settings.showDialog = undefined;
         }