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

Fixes ng-bootstrap#3464
gentoo90 · Jan 30, 2022 · ef7c043 · ef7c043
1 parent 8a8fc1e
commit ef7c043
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/modal/modal-config.ts b/src/modal/modal-config.ts
@@ -1,10 +1,11 @@
 import {Injectable, Injector} from '@angular/core';
 import {NgbConfig} from '../ngb-config';
+import {NgbModalRef} from './modal-ref';
 
 /**
  * Options available when opening new modal windows with `NgbModal.open()` method.
  */
-export interface NgbModalOptions {
+export interface NgbModalOptions<T = any> {
   /**
    * If `true`, modal opening and closing will be animated.
    *
@@ -45,7 +46,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.
@@ -121,7 +122,7 @@ export class NgbModalConfig implements Required<NgbModalOptions> {
   ariaLabelledBy: string;
   ariaDescribedBy: 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
@@ -100,7 +100,7 @@ export class NgbModalRef<T = any> {
   constructor(
       private _windowCmptRef: ComponentRef<NgbModalWindow>, private _contentRef: ContentRef,
       private _backdropCmptRef?: ComponentRef<NgbModalBackdrop>,
-      private _beforeDismiss?: () => boolean | Promise<boolean>) {
+      private _beforeDismiss?: (modalRef: NgbModalRef<any>) => boolean | Promise<boolean>) {
     _windowCmptRef.instance.dismissEvent.subscribe((reason: any) => { this.dismiss(reason); });
 
     this.result = new Promise((resolve, reject) => {
@@ -139,7 +139,7 @@ export class NgbModalRef<T = any> {
       if (!this._beforeDismiss) {
         this._dismiss(reason);
       } else {
-        const dismiss = this._beforeDismiss();
+        const dismiss = this._beforeDismiss(this);
         if (isPromise(dismiss)) {
           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 = {...this._config, animation: this._config.animation, ...options};
     return this._modalStack.open(this._moduleCFR, this._injector, content, combinedOptions);
   }