fix(modal): pass modalRef as an argument into beforeDismiss callback

Fixes ng-bootstrap#3464
gentoo90 · Feb 9, 2020 · caed7d0 · caed7d0
1 parent 0f99806
commit caed7d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/modal/modal-config.ts b/src/modal/modal-config.ts
@@ -1,9 +1,10 @@
 import {Injectable, Injector} from '@angular/core';
+import {NgbModalRef} from './modal-ref';
 
 /**
  * Options available when opening new modal windows with `NgbModal.open()` method.
  */
-export interface NgbModalOptions {
+export interface NgbModalOptions<T = any> {
   /**
    * `aria-labelledby` attribute value to set on the modal window.
    *
@@ -30,7 +31,7 @@ export interface NgbModalOptions {
    *
    * then the modal won't be dismissed.
    */
-  beforeDismiss?: () => boolean | Promise<boolean>;
+  beforeDismiss?: (modalRef: NgbModalRef<T>) => boolean | Promise<boolean>;
 
   /**
    * If `true`, the modal will be centered vertically.
@@ -97,7 +98,7 @@ export interface NgbModalOptions {
 export class NgbModalConfig implements Required<NgbModalOptions> {
   ariaLabelledBy: string;
   backdrop: boolean | 'static' = true;
-  beforeDismiss: () => boolean | Promise<boolean>;
+  beforeDismiss: (modalRef: NgbModalRef<any>) => boolean | Promise<boolean>;
   centered: boolean;
   container: string;
   injector: Injector;

diff --git a/src/modal/modal-ref.ts b/src/modal/modal-ref.ts
@@ -89,7 +89,7 @@ export class NgbModalRef<T = any> {
       if (!this._beforeDismiss) {
         this._dismiss(reason);
       } else {
-        const dismiss = this._beforeDismiss();
+        const dismiss = this._beforeDismiss(this);
         if (dismiss && dismiss.then) {
           dismiss.then(
               result => {

diff --git a/src/modal/modal.ts b/src/modal/modal.ts
@@ -25,7 +25,7 @@ export class NgbModal {
    *
    * Also see the [`NgbModalOptions`](#/components/modal/api#NgbModalOptions) for the list of supported options.
    */
-  open<T>(content: T, options: NgbModalOptions = {}): NgbModalRef<T> {
+  open<T>(content: T, options: NgbModalOptions<T> = {}): NgbModalRef<T> {
     const combinedOptions = Object.assign({}, this._config, options);
     return this._modalStack.open(this._moduleCFR, this._injector, content, combinedOptions);
   }