Commit 5042e08

edusperoniZdravko

authored and

Zdravko

committed

Migrate from ReflectiveInjector (deprecated) to StaticInjector (#1868)

* chore: migrate to StaticInjector * chore: replace parentInjector in detached-loader

1 parent 1f56855 commit 5042e08Copy full SHA for 5042e08

File tree

2 files changed

-8

lines changed

nativescript-angular
- common
  - detached-loader.ts
- directives
  - dialogs.ts

2 files changed

-8

lines changed

`‎nativescript-angular/common/detached-loader.ts`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export class DetachedLoader { // tslint:disable-line:component-class-suffix`
`29`	`29`	`private loadInLocation(componentType: Type<any>): Promise<ComponentRef<any>> {`
`30`	`30`	`const factory = this.resolver.resolveComponentFactory(componentType);`
`31`	`31`	`const componentRef = this.containerRef.createComponent(`
`32`		`- factory, this.containerRef.length, this.containerRef.parentInjector);`
	`32`	`+ factory, this.containerRef.length, this.containerRef.injector);`
`33`	`33`
`34`	`34`	`// Component is created, built may not be checked if we are loading`
`35`	`35`	`// inside component with OnPush CD strategy. Mark us for check to be sure CD will reach us.`
`@@ -52,6 +52,6 @@ export class DetachedLoader { // tslint:disable-line:component-class-suffix`
`52`	`52`
`53`	`53`	`public loadWithFactory<T>(factory: ComponentFactory<T>): ComponentRef<T> {`
`54`	`54`	`return this.containerRef.createComponent(factory,`
`55`		`- this.containerRef.length, this.containerRef.parentInjector, null);`
	`55`	`+ this.containerRef.length, this.containerRef.injector, null);`
`56`	`56`	`}`
`57`	`57`	`}`

`‎nativescript-angular/directives/dialogs.ts`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ import {`
`3`	`3`	`ComponentRef,`
`4`	`4`	`Directive,`
`5`	`5`	`Injectable,`
	`6`	`+ Injector,`
`6`	`7`	`NgModuleRef,`
`7`		`- ReflectiveInjector,`
`8`	`8`	`Type,`
`9`	`9`	`ViewContainerRef`
`10`	`10`	`} from "@angular/core";`
`@@ -18,7 +18,7 @@ import { DetachedLoader } from "../common/detached-loader";`
`18`	`18`	`import { PageFactory, PAGE_FACTORY } from "../platform-providers";`
`19`	`19`	`import { once } from "../common/utils";`
`20`	`20`	`import { topmost, Frame } from "tns-core-modules/ui/frame";`
`21`		`-import { ShowModalOptions } from "tns-core-modules/ui/core/view";`
	`21`	`+import { ShowModalOptions } from "tns-core-modules/ui/core/view";`
`22`	`22`
`23`	`23`	`export type BaseShowModalOptions = Pick<ShowModalOptions, Exclude<keyof ShowModalOptions, "closeCallback" \| "context">>;`
`24`	`24`
`@@ -126,11 +126,11 @@ export class ModalDialogService {`
`126`	`126`	`});`
`127`	`127`
`128`	`128`	`const modalParams = new ModalDialogParams(options.context, closeCallback);`
`129`		`- const providers = ReflectiveInjector.resolve([`
`130`		`- { provide: ModalDialogParams, useValue: modalParams },`
`131`		`- ]);`
`132`	`129`
`133`		`- const childInjector = ReflectiveInjector.fromResolvedProviders(providers, options.containerRef.parentInjector);`
	`130`	`+ const childInjector = Injector.create({`
	`131`	`+ providers: [{ provide: ModalDialogParams, useValue: modalParams }],`
	`132`	`+ parent: options.containerRef.injector`
	`133`	`+ });`
`134`	`134`	`const detachedFactory = options.resolver.resolveComponentFactory(DetachedLoader);`
`135`	`135`	`detachedLoaderRef = options.containerRef.createComponent(detachedFactory, -1, childInjector, null);`
`136`	`136`	`detachedLoaderRef.instance.loadComponent(options.type).then((compRef) => {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5042e08

File tree

2 files changed

2 files changed

`‎nativescript-angular/common/detached-loader.ts`

`‎nativescript-angular/directives/dialogs.ts`

0 commit comments