fix(material-experimental/mdc-form-field): always check hideRequiredM…

…arker (#22068) * fix(material-experimental/mdc-form-field): always check hideRequiredMarker * fix(material-experimental/mdc-form-field): add test * fix(material-experimental/mdc-form-field): add test to legacy (cherry picked from commit d8935d1)
angular · Mar 2, 2021 · 020edd5 · 020edd5
1 parent 901c58e
commit 020edd5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/material-experimental/mdc-form-field/form-field.ts b/src/material-experimental/mdc-form-field/form-field.ts
@@ -313,7 +313,9 @@ export class MatFormField implements AfterViewInit, OnDestroy, AfterContentCheck
               @Inject(DOCUMENT) private _document?: any) {
     if (_defaults && _defaults.appearance) {
       this.appearance = _defaults.appearance;
-    } else if (_defaults && _defaults.hideRequiredMarker) {
+    }
+
+    if (_defaults && _defaults.hideRequiredMarker) {
       this.hideRequiredMarker = true;
     }
   }

diff --git a/src/material-experimental/mdc-input/input.spec.ts b/src/material-experimental/mdc-input/input.spec.ts
@@ -1267,13 +1267,17 @@ describe('MatFormField default options', () => {
     expect(fixture.componentInstance.formField.hideRequiredMarker).toBe(false);
   });
 
-  it('should be able to change the default value of hideRequiredMarker', () => {
+  it('should be able to change the default value of hideRequiredMarker and appearance', () => {
     const fixture = createComponent(MatInputWithAppearance, [{
-      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {hideRequiredMarker: true}}
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {
+        hideRequiredMarker: true,
+        appearance: 'outline',
+      }}
     ]);
 
     fixture.detectChanges();
     expect(fixture.componentInstance.formField.hideRequiredMarker).toBe(true);
+    expect(fixture.componentInstance.formField.appearance).toBe('outline');
   });
 
 });

diff --git a/src/material/input/input.spec.ts b/src/material/input/input.spec.ts
@@ -1703,13 +1703,17 @@ describe('MatFormField default options', () => {
     expect(fixture.componentInstance.formField.hideRequiredMarker).toBe(false);
   });
 
-  it('should be able to change the default value of hideRequiredMarker', () => {
+  it('should be able to change the default value of hideRequiredMarker and appearance', () => {
     const fixture = createComponent(MatInputWithAppearance, [{
-      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {hideRequiredMarker: true}}
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {
+        hideRequiredMarker: true,
+        appearance: 'outline',
+      }}
     ]);
 
     fixture.detectChanges();
     expect(fixture.componentInstance.formField.hideRequiredMarker).toBe(true);
+    expect(fixture.componentInstance.formField.appearance).toBe('outline');
   });
 
 });