fix(dialog): provide default value for MD_DIALOG_DATA token (#4120)

Fixes #4086.
angular · Apr 21, 2017 · d1128fe · d1128fe
1 parent 29caaf3
commit d1128fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
@@ -40,7 +40,7 @@ export class MdDialogConfig {
   position?: DialogPosition;
 
   /** Data being injected into the child component. */
-  data?: any;
+  data?: any = null;
 
   // TODO(jelbourn): add configuration for lifecycle hooks, ARIA labelling.
 }
diff --git a/src/lib/dialog/dialog-injector.ts b/src/lib/dialog/dialog-injector.ts
@@ -15,7 +15,7 @@ export class DialogInjector implements Injector {
       return this._dialogRef;
     }
 
-    if (token === MD_DIALOG_DATA && this._data) {
+    if (token === MD_DIALOG_DATA) {
       return this._data;
     }
 

diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
@@ -349,10 +349,11 @@ describe('MdDialog', () => {
       expect(instance.data.dateParam).toBe(config.data.dateParam);
     });
 
-    it('should throw if injected data is expected but none is passed', () => {
-      expect(() => {
-        dialog.open(DialogWithInjectedData);
-      }).toThrow();
+    it('should default to null if no data is passed', () => {
+      let dialogRef: MdDialogRef<DialogWithInjectedData>;
+
+      expect(() => dialogRef = dialog.open(DialogWithInjectedData)).not.toThrow();
+      expect(dialogRef.componentInstance.data).toBeNull();
     });
   });