Merge pull request #141 from cal-smith/master

fix(modal): upgrade to newer injector api

Author: zvonimirfras

src/modal/alert-modal.component.ts

@@ -1,7 +1,8 @@
 import {
 	Component,
 	Injector,
-	ElementRef
+	ElementRef,
+	Inject
 } from "@angular/core";
 import {
 	trigger,
@@ -71,7 +72,7 @@ import Modal from "./modal.decorator";
 						ibmButton="{{button.type}}"
 						(click)="buttonClicked(i)"
 						[id]="button.id"
-						[attr.modal-primary-focus]="button.type.indexOf('primary') !== -1 ? '' : null">
+						[attr.modal-primary-focus]="(button.type.indexOf('primary') !== -1 ? '' : null)">
 						{{button.text}}
 					</button>
 				</ng-container>
@@ -80,27 +81,18 @@ import Modal from "./modal.decorator";
 	`
 })
 export class AlertModalComponent {
-	modalType = "default";
-	modalLabel: string;
-	modalTitle: string;
-	modalContent: string;
-	buttons = [];
-
 	/**
 	 * Creates an instance of `AlertModalComponent`.
 	 * @param {ModalService} modalService
 	 * @memberof AlertModalComponent
 	 */
 	constructor(
-		private injector: Injector,
-		private elementRef: ElementRef
+		@Inject("modalType") public modalType = "default",
+		@Inject("modalLabel") public modalLabel: string,
+		@Inject("modalTitle") public modalTitle: string,
+		@Inject("modalContent") public modalContent: string,
+		@Inject("buttons") public buttons = []
 	) {
-		this.modalType = this.injector.get("modalType");
-		this.modalLabel = this.injector.get("modalLabel");
-		this.modalTitle = this.injector.get("modalTitle");
-		this.modalContent = this.injector.get("modalContent");
-
-		this.buttons = this.injector.get("buttons") || [];
 		for (let i = 0; i < this.buttons.length; i++) {
 			const button = this.buttons[i];
 			if (!button.id) {

src/modal/modal.service.ts

@@ -2,7 +2,8 @@ import {
 	ComponentFactoryResolver,
 	ComponentRef,
 	ReflectiveInjector,
-	ViewContainerRef
+	ViewContainerRef,
+	Injector
 } from "@angular/core";
 import { ModalComponent } from "./modal.component";
 import { ModalPlaceholderService } from "./modal-placeholder.service";
@@ -47,8 +48,7 @@ export class ModalService {
 		data = Object.assign({}, defaults, data);
 
 		const inputProviders = Object.keys(data.inputs).map(inputName => ({provide: inputName, useValue: data.inputs[inputName]}));
-		const resolvedInputs = ReflectiveInjector.resolve(inputProviders);
-		const injector = ReflectiveInjector.fromResolvedProviders(resolvedInputs, this.placeholder.viewContainerRef.parentInjector);
+		const injector = Injector.create(inputProviders);
 		const factory = this.resolver.resolveComponentFactory(data.component);
 		let focusedElement = document.activeElement;
 		let component = factory.create(injector);

src/modal/modal.stories.ts

@@ -4,7 +4,7 @@ import { withKnobs, text, select } from "@storybook/addon-knobs/angular";
 import { TranslateModule } from "@ngx-translate/core";
 
 import { ModalModule } from "../";
-import { Component, Injector, Input } from "@angular/core";
+import { Component, Input, Inject } from "@angular/core";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { Modal, ModalService } from "../";
 
@@ -25,10 +25,7 @@ import { Modal, ModalService } from "../";
 	`
 })
 class SampleModalComponent {
-	modalText: string;
-	constructor(private injector: Injector) {
-		this.modalText = this.injector.get("modalText");
-	}
+	constructor(@Inject("modalText") public modalText) {}
 }
 
 @Modal()