ngx-bootstrap 5.6.1 → 6.2.0

package/modal/bundles/ngx-bootstrap-modal.umd.js

@@ -195,6 +195,9 @@
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
+    /**
+     * @template T
+     */
     var BsModalRef = /** @class */ (function () {
         function BsModalRef() {
             /**
@@ -212,6 +215,11 @@
         return BsModalRef;
     }());
     if (false) {
+        /**
+         *  Allow user to ID for the modal. Otherwise, a unique number will be given
+         * @type {?}
+         */
+        BsModalRef.prototype.id;
         /**
          * Reference to a component inside the modal. Null if modal's been created with TemplateRef
          * @type {?}
@@ -227,6 +235,16 @@
          * @type {?}
          */
         BsModalRef.prototype.setClass;
+        /**
+         * Event that is fired when the modal behind the ref starts hiding
+         * @type {?}
+         */
+        BsModalRef.prototype.onHide;
+        /**
+         * Event that is fired when the modal behind the ref finishes hiding
+         * @type {?}
+         */
+        BsModalRef.prototype.onHidden;
     }
 
     /**
@@ -249,6 +267,9 @@
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
+    /**
+     * @template T
+     */
     var ModalOptions = /** @class */ (function () {
         function ModalOptions() {
         }
@@ -258,6 +279,11 @@
         return ModalOptions;
     }());
     if (false) {
+        /**
+         *  Allow user to ID for the modal. Otherwise, a unique number will be given
+         * @type {?}
+         */
+        ModalOptions.prototype.id;
         /**
          *  Includes a modal-backdrop element. Alternatively,
          *  specify static for a backdrop which doesn't close the modal on click.
@@ -324,6 +350,8 @@
         initialState: {}
     };
     /** @type {?} */
+    var MODAL_CONFIG_DEFAULT_OVERRIDE = new core.InjectionToken('override-default-config');
+    /** @type {?} */
     var CLASS_NAME = {
         SCROLLBAR_MEASURER: 'modal-scrollbar-measure',
         BACKDROP: 'modal-backdrop',
@@ -348,7 +376,8 @@
     /** @type {?} */
     var DISMISS_REASONS = {
         BACKRDOP: 'backdrop-click',
-        ESC: 'esc'
+        ESC: 'esc',
+        BACK: 'browser-back-navigation-clicked'
     };
 
     /**
@@ -425,6 +454,16 @@
             this.bsModalService.setDismissReason(DISMISS_REASONS.BACKRDOP);
             this.hide();
         };
+        /**
+         * @return {?}
+         */
+        ModalContainerComponent.prototype.onPopState = /**
+         * @return {?}
+         */
+        function () {
+            this.bsModalService.setDismissReason(DISMISS_REASONS.BACK);
+            this.hide();
+        };
         /**
          * @param {?} event
          * @return {?}
@@ -481,7 +520,7 @@
                     _this.bsModalService.getModalsCount() === 1) {
                     _this._renderer.removeClass(document.body, CLASS_NAME.OPEN);
                 }
-                _this.bsModalService.hide(_this.level);
+                _this.bsModalService.hide(_this.config.id);
                 _this.isModalHiding = false;
             }), this.isAnimated ? TRANSITION_DURATIONS.MODAL : 0);
         };
@@ -508,6 +547,7 @@
         ModalContainerComponent.propDecorators = {
             onClickStarted: [{ type: core.HostListener, args: ['mousedown', ['$event'],] }],
             onClickStop: [{ type: core.HostListener, args: ['mouseup', ['$event'],] }],
+            onPopState: [{ type: core.HostListener, args: ['window:popstate',] }],
             onEsc: [{ type: core.HostListener, args: ['window:keydown.esc', ['$event'],] }]
         };
         return ModalContainerComponent;
@@ -663,7 +703,7 @@
      * Mark any code with directive to show it's content in modal
      */
     var ModalDirective = /** @class */ (function () {
-        function ModalDirective(_element, _viewContainerRef, _renderer, clf) {
+        function ModalDirective(_element, _viewContainerRef, _renderer, clf, modalDefaultOption) {
             this._element = _element;
             this._renderer = _renderer;
             /**
@@ -694,6 +734,7 @@
             this.isNested = false;
             this.clickStartedInContent = false;
             this._backdrop = clf.createLoader(_element, _viewContainerRef, _renderer);
+            this._config = modalDefaultOption || modalConfigDefaults;
         }
         Object.defineProperty(ModalDirective.prototype, "config", {
             get: /**
@@ -916,7 +957,7 @@
          * @return {?}
          */
         function (config) {
-            return Object.assign({}, modalConfigDefaults, config);
+            return Object.assign({}, this._config, config);
         };
         /**
          *  Show dialog
@@ -1262,7 +1303,8 @@
             { type: core.ElementRef },
             { type: core.ViewContainerRef },
             { type: core.Renderer2 },
-            { type: componentLoader.ComponentLoaderFactory }
+            { type: componentLoader.ComponentLoaderFactory },
+            { type: ModalOptions, decorators: [{ type: core.Optional }, { type: core.Inject, args: [MODAL_CONFIG_DEFAULT_OVERRIDE,] }] }
         ]; };
         ModalDirective.propDecorators = {
             config: [{ type: core.Input }],
@@ -1302,7 +1344,7 @@
         ModalDirective.prototype.onHidden;
         /**
          * This field contains last dismiss reason.
-         * Possible values: `backdrop-click`, `esc` and `null`
+         * Possible values: `backdrop-click`, `esc` and `id: number`
          * (if modal was closed by direct call of `.hide()`).
          * @type {?}
          */
@@ -1379,10 +1421,9 @@
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     var BsModalService = /** @class */ (function () {
-        function BsModalService(rendererFactory, clf) {
+        function BsModalService(rendererFactory, clf, modalDefaultOption) {
             this.clf = clf;
-            // constructor props
-            this.config = modalConfigDefaults;
+            this.modalDefaultOption = modalDefaultOption;
             // tslint:disable-next-line:no-any
             this.onShow = new core.EventEmitter();
             // tslint:disable-next-line:no-any
@@ -1395,56 +1436,65 @@
             this.originalBodyPadding = 0;
             this.scrollbarWidth = 0;
             this.modalsCount = 0;
-            this.lastDismissReason = '';
+            this.lastDismissReason = null;
             this.loaders = [];
             this._backdropLoader = this.clf.createLoader(null, null, null);
             this._renderer = rendererFactory.createRenderer(null, null);
+            this.config = modalDefaultOption ?
+                (Object.assign({}, modalConfigDefaults, modalDefaultOption)) :
+                modalConfigDefaults;
         }
         /** Shows a modal */
-        // tslint:disable-next-line:no-any
         /**
          * Shows a modal
+         * @template T
          * @param {?} content
          * @param {?=} config
          * @return {?}
          */
-        // tslint:disable-next-line:no-any
         BsModalService.prototype.show = /**
          * Shows a modal
+         * @template T
          * @param {?} content
          * @param {?=} config
          * @return {?}
          */
+        function (
         // tslint:disable-next-line:no-any
-        function (content, config) {
+        content, config) {
             this.modalsCount++;
             this._createLoaders();
-            this.config = Object.assign({}, modalConfigDefaults, config);
+            /** @type {?} */
+            var id = (config === null || config === void 0 ? void 0 : config.id) || (new Date()).getUTCMilliseconds();
+            this.config = this.modalDefaultOption ?
+                Object.assign({}, modalConfigDefaults, this.modalDefaultOption, config) :
+                Object.assign({}, modalConfigDefaults, config);
+            this.config.id = id;
             this._showBackdrop();
             this.lastDismissReason = null;
             return this._showModal(content);
         };
         /**
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
         BsModalService.prototype.hide = /**
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
-        function (level) {
+        function (id) {
             var _this = this;
-            if (this.modalsCount === 1) {
+            if (this.modalsCount === 1 || id == null) {
                 this._hideBackdrop();
                 this.resetScrollbar();
             }
-            this.modalsCount = this.modalsCount >= 1 ? this.modalsCount - 1 : 0;
+            this.modalsCount = this.modalsCount >= 1 && id != null ? this.modalsCount - 1 : 0;
             setTimeout((/**
              * @return {?}
              */
             function () {
-                _this._hideModal(level);
-                _this.removeLoaders(level);
+                _this._hideModal(id);
+                _this.removeLoaders(id);
             }), this.config.animated ? TRANSITION_DURATIONS.BACKDROP : 0);
         };
         /**
@@ -1502,20 +1552,20 @@
          */
         function (content) {
             var e_1, _a;
-            var _this = this;
+            var _b;
             /** @type {?} */
             var modalLoader = this.loaders[this.loaders.length - 1];
             if (this.config && this.config.providers) {
                 try {
-                    for (var _b = __values(this.config.providers), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var provider = _c.value;
+                    for (var _c = __values(this.config.providers), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var provider = _d.value;
                         modalLoader.provide(provider);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -1527,21 +1577,11 @@
                 .provide({ provide: ModalOptions, useValue: this.config })
                 .provide({ provide: BsModalRef, useValue: bsModalRef })
                 .attach(ModalContainerComponent)
-                .to('body')
-                .show({ content: content, isAnimated: this.config.animated, initialState: this.config.initialState, bsModalService: this });
-            modalContainerRef.instance.level = this.getModalsCount();
+                .to('body');
             bsModalRef.hide = (/**
              * @return {?}
              */
-            function () {
-                /** @type {?} */
-                var duration = _this.config.animated ? TRANSITION_DURATIONS.MODAL : 0;
-                setTimeout((/**
-                 * @return {?}
-                 */
-                function () { return modalContainerRef.instance.hide(); }), duration);
-            });
-            bsModalRef.content = modalLoader.getInnerComponent() || null;
+            function () { return modalContainerRef.instance.hide(); });
             bsModalRef.setClass = (/**
              * @param {?} newClass
              * @return {?}
@@ -1549,21 +1589,54 @@
             function (newClass) {
                 modalContainerRef.instance.config.class = newClass;
             });
+            bsModalRef.onHidden = new core.EventEmitter();
+            bsModalRef.onHide = new core.EventEmitter();
+            this.copyEvent(modalLoader.onBeforeHide, bsModalRef.onHide);
+            this.copyEvent(modalLoader.onHidden, bsModalRef.onHidden);
+            // call 'show' method after assign setClass in bsModalRef.
+            // it makes modal component's bsModalRef available to call setClass method
+            modalContainerRef.show({
+                content: content,
+                isAnimated: this.config.animated,
+                initialState: this.config.initialState,
+                bsModalService: this,
+                id: this.config.id
+            });
+            modalContainerRef.instance.level = this.getModalsCount();
+            bsModalRef.content = modalLoader.getInnerComponent() || null;
+            bsModalRef.id = (_b = modalContainerRef.instance.config) === null || _b === void 0 ? void 0 : _b.id;
             return bsModalRef;
         };
         /**
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
         BsModalService.prototype._hideModal = /**
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
-        function (level) {
-            /** @type {?} */
-            var modalLoader = this.loaders[level - 1];
-            if (modalLoader) {
-                modalLoader.hide();
+        function (id) {
+            if (id != null) {
+                /** @type {?} */
+                var indexToRemove = this.loaders.findIndex((/**
+                 * @param {?} loader
+                 * @return {?}
+                 */
+                function (loader) { return loader.instance.config.id === id; }));
+                /** @type {?} */
+                var modalLoader = this.loaders[indexToRemove];
+                if (modalLoader) {
+                    modalLoader.hide(id);
+                }
+            }
+            else {
+                this.loaders.forEach((/**
+                 * @param {?} loader
+                 * @return {?}
+                 */
+                function (loader) {
+                    loader.hide(loader.instance.config.id);
+                }));
             }
         };
         /**
@@ -1593,6 +1666,7 @@
          * @return {?}
          */
         function () {
+            this._renderer.removeClass(document.body, CLASS_NAME.OPEN);
             this._backdropLoader.hide();
             this.backdropRef = null;
         };
@@ -1682,24 +1756,37 @@
         };
         /**
          * @private
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
         BsModalService.prototype.removeLoaders = /**
          * @private
-         * @param {?} level
+         * @param {?=} id
          * @return {?}
          */
-        function (level) {
-            this.loaders.splice(level - 1, 1);
-            this.loaders.forEach((/**
-             * @param {?} loader
-             * @param {?} i
-             * @return {?}
-             */
-            function (loader, i) {
-                loader.instance.level = i + 1;
-            }));
+        function (id) {
+            if (id != null) {
+                /** @type {?} */
+                var indexToRemove = this.loaders.findIndex((/**
+                 * @param {?} loader
+                 * @return {?}
+                 */
+                function (loader) { return loader.instance.config.id === id; }));
+                if (indexToRemove >= 0) {
+                    this.loaders.splice(indexToRemove, 1);
+                    this.loaders.forEach((/**
+                     * @param {?} loader
+                     * @param {?} i
+                     * @return {?}
+                     */
+                    function (loader, i) {
+                        loader.instance.level = i + 1;
+                    }));
+                }
+            }
+            else {
+                this.loaders.splice(0, this.loaders.length);
+            }
         };
         // tslint:disable-next-line:no-any
         // tslint:disable-next-line:no-any
@@ -1720,10 +1807,11 @@
         function (from, to) {
             var _this = this;
             from.subscribe((/**
+             * @param {?} data
              * @return {?}
              */
-            function () {
-                to.emit(_this.lastDismissReason);
+            function (data) {
+                to.emit(_this.lastDismissReason || data);
             }));
         };
         BsModalService.decorators = [
@@ -1732,7 +1820,8 @@
         /** @nocollapse */
         BsModalService.ctorParameters = function () { return [
             { type: core.RendererFactory2 },
-            { type: componentLoader.ComponentLoaderFactory }
+            { type: componentLoader.ComponentLoaderFactory },
+            { type: ModalOptions, decorators: [{ type: core.Optional }, { type: core.Inject, args: [MODAL_CONFIG_DEFAULT_OVERRIDE,] }] }
         ]; };
         return BsModalService;
     }());
@@ -1797,6 +1886,11 @@
          * @private
          */
         BsModalService.prototype.clf;
+        /**
+         * @type {?}
+         * @private
+         */
+        BsModalService.prototype.modalDefaultOption;
     }
 
     /**
@@ -1846,6 +1940,7 @@
 
     exports.BsModalRef = BsModalRef;
     exports.BsModalService = BsModalService;
+    exports.MODAL_CONFIG_DEFAULT_OVERRIDE = MODAL_CONFIG_DEFAULT_OVERRIDE;
     exports.ModalBackdropComponent = ModalBackdropComponent;
     exports.ModalBackdropOptions = ModalBackdropOptions;
     exports.ModalContainerComponent = ModalContainerComponent;