fix(modal): add typing for modalRef.componentInstance (ng-bootstrap…

…#2815)

Fixes ng-bootstrap#2479

src/modal/modal-ref.ts

@@ -34,7 +34,7 @@ export class NgbActiveModal {
 /**
  * A reference to the newly opened modal returned by the `NgbModal.open()` method.
  */
-export class NgbModalRef {
+export class NgbModalRef<T = any> {
   private _closed = new Subject<any>();
   private _dismissed = new Subject<any>();
   private _hidden = new Subject<void>();
@@ -46,7 +46,7 @@ export class NgbModalRef {
    *
    * When a `TemplateRef` is used as the content or when the modal is closed, will return `undefined`.
    */
-  get componentInstance(): any {
+  get componentInstance(): T extends new (...args: any[]) => any? InstanceType<T>: undefined {
     if (this._contentRef && this._contentRef.componentRef) {
       return this._contentRef.componentRef.instance;
     }

src/modal/modal.spec.ts

@@ -1216,7 +1216,7 @@ export class WithSkipTabindexFirstFocusableModalCmpt {
 })
 class TestComponent {
   name = 'World';
-  openedModal: NgbModalRef;
+  openedModal: NgbModalRef<string>;
   show = true;
   @ViewChild('content', {static: true}) tplContent;
   @ViewChild('destroyableContent', {static: true}) tplDestroyableContent;

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(content: any, options: NgbModalOptions = {}): NgbModalRef {
+  open<T>(content: T, options: NgbModalOptions = {}): NgbModalRef<T> {
     const combinedOptions = {...this._config, animation: this._config.animation, ...options};
     return this._modalStack.open(this._moduleCFR, this._injector, content, combinedOptions);
   }