fix(media-marshaller): do not propagate undefined value (#1245)

angular · May 9, 2020 · b05d51a · b05d51a
1 parent bf069af
commit b05d51a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/lib/core/media-marshaller/media-marshaller.ts b/src/lib/core/media-marshaller/media-marshaller.ts
@@ -317,7 +317,7 @@ export class MediaMarshaller {
       const activatedBp = this.activatedBreakpoints[i];
       const valueMap = bpMap.get(activatedBp.alias);
       if (valueMap) {
-        if (key === undefined || valueMap.has(key)) {
+        if (key === undefined || (valueMap.has(key) && valueMap.get(key) !== undefined)) {
           return valueMap;
         }
       }

diff --git a/src/lib/extended/class/class.spec.ts b/src/lib/extended/class/class.spec.ts
@@ -198,6 +198,12 @@ describe('class directive', () => {
     expectNativeEl(fixture).toHaveCssClass('mat-class');
   });
 
+  it('should support more than one responsive breakpoint on one element with undefined', () => {
+    createTestComponent(`<div ngClass.lt-lg="mat-class" [ngClass.md]="undefined"></div>`);
+    mediaController.activate('md', true);
+    expectNativeEl(fixture).toHaveCssClass('mat-class');
+  });
+
   it('should work with ngClass object notation', () => {
     createTestComponent(`
       <div [ngClass]="{'x1': hasX1, 'x3': hasX3}"