-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(model): introduce 'container' option
This is major refactoring of the NgbModalService that makes it easier to use (we no longer need to add ngbModalContainer) and fixes 2 existing issues. BREAKING CHANGE: The `ngbModalContainer` directive is no longer needed and was removed from this project. Just remove any references to the `<template ngbModalContainer></template>` from your projects. Closes #1018 Closes #1264 Closes #1373
- Loading branch information
1 parent
79dd101
commit 743db91
Showing
10 changed files
with
212 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,94 @@ | ||
| import {Injectable, Injector, ComponentFactoryResolver} from '@angular/core'; | ||
| import { | ||
| ApplicationRef, | ||
| Injectable, | ||
| Injector, | ||
| ReflectiveInjector, | ||
| ComponentFactory, | ||
| ComponentFactoryResolver, | ||
| ComponentRef, | ||
| TemplateRef | ||
| } from '@angular/core'; | ||
|
|
||
| import {NgbModalRef} from './modal-ref'; | ||
| import {NgbModalContainer} from './modal-container'; | ||
| import {ContentRef} from '../util/popup'; | ||
| import {isDefined, isString} from '../util/util'; | ||
|
|
||
| import {NgbModalBackdrop} from './modal-backdrop'; | ||
| import {NgbModalWindow} from './modal-window'; | ||
| import {NgbActiveModal, NgbModalRef} from './modal-ref'; | ||
|
|
||
| @Injectable() | ||
| export class NgbModalStack { | ||
| private modalContainer: NgbModalContainer; | ||
| private _backdropFactory: ComponentFactory<NgbModalBackdrop>; | ||
| private _windowFactory: ComponentFactory<NgbModalWindow>; | ||
|
|
||
| constructor( | ||
| private _applicationRef: ApplicationRef, private _injector: Injector, | ||
| private _componentFactoryResolver: ComponentFactoryResolver) { | ||
| this._backdropFactory = _componentFactoryResolver.resolveComponentFactory(NgbModalBackdrop); | ||
| this._windowFactory = _componentFactoryResolver.resolveComponentFactory(NgbModalWindow); | ||
| } | ||
|
|
||
| open(moduleCFR: ComponentFactoryResolver, contentInjector: Injector, content: any, options): NgbModalRef { | ||
| const containerSelector = options.container || 'body'; | ||
| const containerEl = document.querySelector(containerSelector); | ||
|
|
||
| if (!containerEl) { | ||
| throw new Error(`The specified modal container "${containerSelector}" was not found in the DOM.`); | ||
| } | ||
|
|
||
| const activeModal = new NgbActiveModal(); | ||
| const contentRef = this._getContentRef(moduleCFR, contentInjector, content, activeModal); | ||
|
|
||
| let windowCmptRef: ComponentRef<NgbModalWindow>; | ||
| let backdropCmptRef: ComponentRef<NgbModalBackdrop>; | ||
| let ngbModalRef: NgbModalRef; | ||
|
|
||
| open(moduleCFR: ComponentFactoryResolver, contentInjector: Injector, content: any, options = {}): NgbModalRef { | ||
| if (!this.modalContainer) { | ||
| throw new Error( | ||
| 'Missing modal container, add <template ngbModalContainer></template> to one of your application templates.'); | ||
|
|
||
| if (options.backdrop !== false) { | ||
| backdropCmptRef = this._backdropFactory.create(this._injector); | ||
| this._applicationRef.attachView(backdropCmptRef.hostView); | ||
| containerEl.appendChild(backdropCmptRef.location.nativeElement); | ||
| } | ||
| windowCmptRef = this._windowFactory.create(this._injector, contentRef.nodes); | ||
| this._applicationRef.attachView(windowCmptRef.hostView); | ||
| containerEl.appendChild(windowCmptRef.location.nativeElement); | ||
|
|
||
| ngbModalRef = new NgbModalRef(windowCmptRef, contentRef, backdropCmptRef); | ||
|
|
||
| activeModal.close = (result: any) => { ngbModalRef.close(result); }; | ||
| activeModal.dismiss = (reason: any) => { ngbModalRef.dismiss(reason); }; | ||
|
|
||
| this._applyWindowOptions(windowCmptRef.instance, options); | ||
|
|
||
| return this.modalContainer.open(moduleCFR, contentInjector, content, options); | ||
| return ngbModalRef; | ||
| } | ||
|
|
||
| registerContainer(modalContainer: NgbModalContainer) { this.modalContainer = modalContainer; } | ||
| private _applyWindowOptions(windowInstance: NgbModalWindow, options: Object): void { | ||
| ['backdrop', 'keyboard', 'size', 'windowClass'].forEach((optionName: string) => { | ||
| if (isDefined(options[optionName])) { | ||
| windowInstance[optionName] = options[optionName]; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private _getContentRef( | ||
| moduleCFR: ComponentFactoryResolver, contentInjector: Injector, content: any, | ||
| context: NgbActiveModal): ContentRef { | ||
| if (!content) { | ||
| return new ContentRef([]); | ||
| } else if (content instanceof TemplateRef) { | ||
| const viewRef = content.createEmbeddedView(context); | ||
| this._applicationRef.attachView(viewRef); | ||
| return new ContentRef([viewRef.rootNodes], viewRef); | ||
| } else if (isString(content)) { | ||
| return new ContentRef([[document.createTextNode(`${content}`)]]); | ||
| } else { | ||
| const contentCmptFactory = moduleCFR.resolveComponentFactory(content); | ||
| const modalContentInjector = | ||
| ReflectiveInjector.resolveAndCreate([{provide: NgbActiveModal, useValue: context}], contentInjector); | ||
| const componentRef = contentCmptFactory.create(modalContentInjector); | ||
| this._applicationRef.attachView(componentRef.hostView); | ||
| return new ContentRef([[componentRef.location.nativeElement]], componentRef.hostView, componentRef); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.