fix(cdk/dialog): use config injector if provided

Author: ldulary

src/cdk/dialog/dialog.spec.ts

@@ -12,6 +12,7 @@ import {
   Directive,
   Inject,
   Injector,
+  Optional,
   TemplateRef,
   ViewChild,
   ViewContainerRef,
@@ -125,6 +126,21 @@ describe('Dialog', () => {
     );
   });
 
+  it('should use custom test injector', () => {
+    // Create a custom injector for the component.
+    let viewContainerFixtureChocolateInjector = TestBed.createComponent(PizzaSnack);
+    viewContainerFixtureChocolateInjector.detectChanges();
+    let chocolateInjector = new ChocolateInjector(
+      viewContainerFixtureChocolateInjector.componentInstance.injector,
+    );
+
+    let dialogRef = dialog.open(PizzaSnack, {
+      injector: chocolateInjector,
+    });
+
+    expect(dialogRef.componentInstance!.snack.toString()).toBe('Chocolate');
+  });
+
   it('should open a dialog with a component and no ViewContainerRef', () => {
     let dialogRef = dialog.open(PizzaMsg);
 
@@ -1223,3 +1239,26 @@ class DialogWithoutFocusableElements {}
   encapsulation: ViewEncapsulation.ShadowDom,
 })
 class ShadowDomComponent {}
+
+class Chocolate {
+  toString() {
+    return 'Chocolate';
+  }
+}
+
+class ChocolateInjector {
+  constructor(public parentInjector: Injector) {}
+
+  get(token: any) {
+    return token === Chocolate ? new Chocolate() : this.parentInjector.get<any>(token);
+  }
+}
+
+/** Simple component for testing custom injector. */
+@Component({
+  selector: 'pizza-snack',
+  template: '<p>Pizza</p><p>{{snack}}</p><ng-content></ng-content>',
+})
+class PizzaSnack {
+  constructor(@Optional() public snack: Chocolate, public injector: Injector) {}
+}

src/cdk/dialog/dialog.ts

@@ -333,7 +333,7 @@ export class Dialog implements OnDestroy {
       });
     }
 
-    return Injector.create({parent: userInjector || this._injector, providers});
+    return Injector.create({parent: config.injector || userInjector || this._injector, providers});
   }
 
   /**