fix: remove deprecated 'ComponentFactoryResolver'

ng-bootstrap · Nov 10, 2021 · 60514a3 · 60514a3
1 parent a6fd72b
commit 60514a3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/src/datepicker/datepicker-input.ts b/src/datepicker/datepicker-input.ts
@@ -1,6 +1,5 @@
 import {
   ChangeDetectorRef,
-  ComponentFactoryResolver,
   ComponentRef,
   Directive,
   ElementRef,
@@ -287,8 +286,8 @@ export class NgbInputDatepicker implements OnChanges,
 
   constructor(
       private _parserFormatter: NgbDateParserFormatter, private _elRef: ElementRef<HTMLInputElement>,
-      private _vcRef: ViewContainerRef, private _renderer: Renderer2, private _cfr: ComponentFactoryResolver,
-      private _ngZone: NgZone, private _calendar: NgbCalendar, private _dateAdapter: NgbDateAdapter<any>,
+      private _vcRef: ViewContainerRef, private _renderer: Renderer2, private _ngZone: NgZone,
+      private _calendar: NgbCalendar, private _dateAdapter: NgbDateAdapter<any>,
       @Inject(DOCUMENT) private _document: any, private _changeDetector: ChangeDetectorRef,
       config: NgbInputDatepickerConfig) {
     ['autoClose', 'container', 'positionTarget', 'placement'].forEach(input => this[input] = config[input]);
@@ -353,8 +352,7 @@ export class NgbInputDatepicker implements OnChanges,
    */
   open() {
     if (!this.isOpen()) {
-      const cf = this._cfr.resolveComponentFactory(NgbDatepicker);
-      this._cRef = this._vcRef.createComponent(cf);
+      this._cRef = this._vcRef.createComponent(NgbDatepicker);
 
       this._applyPopupStyling(this._cRef.location.nativeElement);
       this._applyDatepickerInputs(this._cRef.instance);

diff --git a/src/popover/popover.ts b/src/popover/popover.ts
@@ -15,7 +15,6 @@ import {
   ElementRef,
   TemplateRef,
   ViewContainerRef,
-  ComponentFactoryResolver,
   NgZone,
   SimpleChanges,
   ViewEncapsulation,
@@ -190,8 +189,8 @@ export class NgbPopover implements OnInit, OnDestroy, OnChanges {
 
   constructor(
       private _elementRef: ElementRef<HTMLElement>, private _renderer: Renderer2, injector: Injector,
-      componentFactoryResolver: ComponentFactoryResolver, viewContainerRef: ViewContainerRef, config: NgbPopoverConfig,
-      private _ngZone: NgZone, @Inject(DOCUMENT) private _document: any, private _changeDetector: ChangeDetectorRef,
+      viewContainerRef: ViewContainerRef, config: NgbPopoverConfig, private _ngZone: NgZone,
+      @Inject(DOCUMENT) private _document: any, private _changeDetector: ChangeDetectorRef,
       applicationRef: ApplicationRef) {
     this.animation = config.animation;
     this.autoClose = config.autoClose;
@@ -203,8 +202,7 @@ export class NgbPopover implements OnInit, OnDestroy, OnChanges {
     this.openDelay = config.openDelay;
     this.closeDelay = config.closeDelay;
     this._popupService = new PopupService<NgbPopoverWindow>(
-        NgbPopoverWindow, injector, viewContainerRef, _renderer, this._ngZone, componentFactoryResolver,
-        applicationRef);
+        NgbPopoverWindow, injector, viewContainerRef, _renderer, this._ngZone, applicationRef);
 
     this._zoneSubscription = _ngZone.onStable.subscribe(() => {
       if (this._windowRef) {

diff --git a/src/tooltip/tooltip.ts b/src/tooltip/tooltip.ts
@@ -14,7 +14,6 @@ import {
   ElementRef,
   TemplateRef,
   ViewContainerRef,
-  ComponentFactoryResolver,
   NgZone,
   ViewEncapsulation,
   ChangeDetectorRef,
@@ -156,8 +155,8 @@ export class NgbTooltip implements OnInit, OnDestroy, OnChanges {
 
   constructor(
       private _elementRef: ElementRef<HTMLElement>, private _renderer: Renderer2, injector: Injector,
-      componentFactoryResolver: ComponentFactoryResolver, viewContainerRef: ViewContainerRef, config: NgbTooltipConfig,
-      private _ngZone: NgZone, @Inject(DOCUMENT) private _document: any, private _changeDetector: ChangeDetectorRef,
+      viewContainerRef: ViewContainerRef, config: NgbTooltipConfig, private _ngZone: NgZone,
+      @Inject(DOCUMENT) private _document: any, private _changeDetector: ChangeDetectorRef,
       applicationRef: ApplicationRef) {
     this.animation = config.animation;
     this.autoClose = config.autoClose;
@@ -169,8 +168,7 @@ export class NgbTooltip implements OnInit, OnDestroy, OnChanges {
     this.openDelay = config.openDelay;
     this.closeDelay = config.closeDelay;
     this._popupService = new PopupService<NgbTooltipWindow>(
-        NgbTooltipWindow, injector, viewContainerRef, _renderer, this._ngZone, componentFactoryResolver,
-        applicationRef);
+        NgbTooltipWindow, injector, viewContainerRef, _renderer, this._ngZone, applicationRef);
 
     this._zoneSubscription = _ngZone.onStable.subscribe(() => {
       if (this._windowRef) {

diff --git a/src/typeahead/typeahead.ts b/src/typeahead/typeahead.ts
@@ -1,6 +1,5 @@
 import {
   ChangeDetectorRef,
-  ComponentFactoryResolver,
   ComponentRef,
   Directive,
   ElementRef,
@@ -196,9 +195,9 @@ export class NgbTypeahead implements ControlValueAccessor,
 
   constructor(
       private _elementRef: ElementRef<HTMLInputElement>, viewContainerRef: ViewContainerRef,
-      private _renderer: Renderer2, injector: Injector, componentFactoryResolver: ComponentFactoryResolver,
-      config: NgbTypeaheadConfig, ngZone: NgZone, private _live: Live, @Inject(DOCUMENT) private _document: any,
-      private _ngZone: NgZone, private _changeDetector: ChangeDetectorRef, applicationRef: ApplicationRef) {
+      private _renderer: Renderer2, injector: Injector, config: NgbTypeaheadConfig, ngZone: NgZone, private _live: Live,
+      @Inject(DOCUMENT) private _document: any, private _ngZone: NgZone, private _changeDetector: ChangeDetectorRef,
+      applicationRef: ApplicationRef) {
     this.container = config.container;
     this.editable = config.editable;
     this.focusFirst = config.focusFirst;
@@ -211,8 +210,7 @@ export class NgbTypeahead implements ControlValueAccessor,
     this._resubscribeTypeahead = new BehaviorSubject(null);
 
     this._popupService = new PopupService<NgbTypeaheadWindow>(
-        NgbTypeaheadWindow, injector, viewContainerRef, _renderer, this._ngZone, componentFactoryResolver,
-        applicationRef);
+        NgbTypeaheadWindow, injector, viewContainerRef, _renderer, this._ngZone, applicationRef);
 
     this._zoneSubscription = ngZone.onStable.subscribe(() => {
       if (this.isPopupOpen()) {

diff --git a/src/util/popup.ts b/src/util/popup.ts
@@ -1,6 +1,5 @@
 import {
   ApplicationRef,
-  ComponentFactoryResolver,
   ComponentRef,
   Injector,
   NgZone,
@@ -25,16 +24,15 @@ export class PopupService<T> {
 
   constructor(
       private _type: any, private _injector: Injector, private _viewContainerRef: ViewContainerRef,
-      private _renderer: Renderer2, private _ngZone: NgZone,
-      private _componentFactoryResolver: ComponentFactoryResolver, private _applicationRef: ApplicationRef) {}
+      private _renderer: Renderer2, private _ngZone: NgZone, private _applicationRef: ApplicationRef) {}
 
   open(content?: string | TemplateRef<any>, context?: any, animation = false):
       {windowRef: ComponentRef<T>, transition$: Observable<void>} {
     if (!this._windowRef) {
       this._contentRef = this._getContentRef(content, context);
       this._windowRef = this._viewContainerRef.createComponent(
-          this._componentFactoryResolver.resolveComponentFactory<T>(this._type), this._viewContainerRef.length,
-          this._injector, this._contentRef.nodes);
+          this._type,
+          {index: this._viewContainerRef.length, injector: this._injector, projectableNodes: this._contentRef.nodes});
     }
 
     const {nativeElement} = this._windowRef.location;