fix(material/input): only apply styling when inside a form field

Currently `mat-form-field` brings in the styles for `MatInput`. but the problem is that
they target a class that is applied even to inputs that aren't inside a form field.

These changes aim to prevent CSS from bleeding out by only styling inputs inside a `mat-form-field`.

Fixes #21871.

Author: crisbeto

src/material-experimental/mdc-chips/chip-input.spec.ts

@@ -130,6 +130,7 @@ describe('MDC-based MatChipInput', () => {
 
     it('should set input styling classes', () => {
       expect(inputNativeElement.classList).toContain('mat-mdc-input-element');
+      expect(inputNativeElement.classList).toContain('mat-mdc-form-field-control');
       expect(inputNativeElement.classList).toContain('mat-mdc-chip-input');
       expect(inputNativeElement.classList).toContain('mdc-text-field__input');
     });

src/material-experimental/mdc-chips/chip-input.ts

@@ -8,7 +8,17 @@
 
 import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
 import {hasModifierKey, TAB} from '@angular/cdk/keycodes';
-import {Directive, ElementRef, EventEmitter, Inject, Input, OnChanges, Output} from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  Inject,
+  Input,
+  OnChanges,
+  Optional,
+  Output,
+} from '@angular/core';
+import {MatFormField, MAT_FORM_FIELD} from '@angular/material-experimental/mdc-form-field';
 import {MatChipsDefaultOptions, MAT_CHIPS_DEFAULT_OPTIONS} from './chip-default-options';
 import {MatChipGrid} from './chip-grid';
 import {MatChipTextControl} from './chip-text-control';
@@ -104,9 +114,14 @@ export class MatChipInput implements MatChipTextControl, OnChanges {
 
   constructor(
     protected _elementRef: ElementRef<HTMLInputElement>,
-    @Inject(MAT_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatChipsDefaultOptions) {
-    this._inputElement = this._elementRef.nativeElement as HTMLInputElement;
-  }
+    @Inject(MAT_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatChipsDefaultOptions,
+    @Optional() @Inject(MAT_FORM_FIELD) formField?: MatFormField) {
+      this._inputElement = this._elementRef.nativeElement as HTMLInputElement;
+
+      if (formField) {
+        this._inputElement.classList.add('mat-form-field-control');
+      }
+    }
 
   ngOnChanges() {
     this._chipGrid.stateChanges.next();

src/material-experimental/mdc-form-field/_form-field-native-select.scss

@@ -14,7 +14,7 @@ $mat-form-field-select-horizontal-end-padding: $mat-form-field-select-arrow-widt
   // Remove the native select down arrow and ensure that the native appearance
   // does not conflict with the form-field. e.g. Focus indication of the native
   // select is undesired since we handle focus as part of the form-field.
-  select.mat-mdc-input-element {
+  select.mat-mdc-form-field-control {
     -moz-appearance: none;
     -webkit-appearance: none;
     background-color: transparent;
@@ -80,7 +80,7 @@ $mat-form-field-select-horizontal-end-padding: $mat-form-field-select-arrow-widt
 
     // Add padding on the end of the native select so that the content does not
     // overlap with the Material Design arrow.
-    .mat-mdc-input-element {
+    .mat-mdc-form-field-control {
       padding-right: $mat-form-field-select-horizontal-end-padding;
       [dir='rtl'] & {
         padding-right: 0;
@@ -91,7 +91,7 @@ $mat-form-field-select-horizontal-end-padding: $mat-form-field-select-arrow-widt
 }
 
 @mixin mat-mdc-private-form-field-native-select-color($config) {
-  select.mat-mdc-input-element {
+  select.mat-mdc-form-field-control {
     // On dark themes we set the native `select` color to some shade of white,
     // however the color propagates to all of the `option` elements, which are
     // always on a white background inside the dropdown, causing them to blend in.

src/material-experimental/mdc-form-field/_form-field-theme.scss

@@ -70,7 +70,7 @@
 
     // MDC uses the `subtitle1` level for the input label and value, but the spec shows `body1` as
     // the correct level.
-    .mat-mdc-input-element,
+    .mat-mdc-form-field-control,
     .mat-mdc-form-field label,
     .mat-mdc-form-field-prefix,
     .mat-mdc-form-field-suffix {

src/material-experimental/mdc-form-field/_mdc-text-field-structure-overrides.scss

@@ -10,7 +10,7 @@
   // Unset the border set by MDC. We move the border (which serves as the Material Design
   // text-field bottom line) into its own element. This is necessary because we want the
   // bottom-line to span across the whole form-field (including prefixes and suffixes).
-  .mat-mdc-input-element {
+  .mat-mdc-form-field-control {
     border: none;
   }
 
@@ -27,8 +27,8 @@
   // not work for us since we support arbitrary form field controls which don't necessarily
   // use an `input` element. We organize the vertical spacing on the infix container.
   .mdc-text-field--no-label:not(.mdc-text-field--textarea)
-  .mat-mdc-input-element.mdc-text-field__input,
-  .mat-mdc-text-field-wrapper .mat-mdc-input-element {
+  .mat-mdc-form-field-control.mdc-text-field__input,
+  .mat-mdc-text-field-wrapper .mat-mdc-form-field-control {
     height: auto;
   }
 

src/material-experimental/mdc-input/input.spec.ts

@@ -889,6 +889,17 @@ describe('MatMdcInput without forms', () => {
     expect(formField.classList).toContain('mat-warn');
   }));
 
+  it('should set a class on the input depending on whether it is in a form field', fakeAsync(() => {
+    const fixture = createComponent(MatInputInsideOutsideFormField);
+    fixture.detectChanges();
+
+    const inFormField = fixture.nativeElement.querySelector('.inside');
+    const outsideFormField = fixture.nativeElement.querySelector('.outside');
+
+    expect(inFormField.classList).toContain('mat-mdc-form-field-control');
+    expect(outsideFormField.classList).not.toContain('mat-mdc-form-field-control');
+  }));
+
 });
 
 describe('MatMdcInput with forms', () => {
@@ -1786,3 +1797,15 @@ class CustomMatInputAccessor {
 class MatInputWithColor {
   color: ThemePalette;
 }
+
+
+@Component({
+  template: `
+    <mat-form-field>
+      <input class="inside" matNativeControl>
+    </mat-form-field>
+
+    <input class="outside" matNativeControl>
+  `
+})
+class MatInputInsideOutsideFormField {}

src/material-experimental/mdc-input/input.ts

@@ -19,13 +19,17 @@ import {MatInput as BaseMatInput} from '@angular/material/input';
       input[matNativeControl], textarea[matNativeControl]`,
   exportAs: 'matInput',
   host: {
-    'class': 'mat-mdc-input-element mdc-text-field__input',
-    // The BaseMatInput parent class adds `mat-input-element` and `mat-form-field-autofill-control`
-    // to the CSS classlist, but this should not be added for this MDC equivalent input.
+    'class': 'mat-mdc-input-element',
+    // The BaseMatInput parent class adds `mat-input-element`, `mat-form-field-control` and
+    // `mat-form-field-autofill-control` to the CSS class list, but this should not be added for
+    // this MDC equivalent input.
     '[class.mat-form-field-autofill-control]': 'false',
     '[class.mat-input-element]': 'false',
+    '[class.mat-form-field-control]': 'false',
     '[class.mat-input-server]': '_isServer',
     '[class.mat-mdc-textarea-input]': '_isTextarea',
+    '[class.mat-mdc-form-field-control]': '_isInFormField',
+    '[class.mdc-text-field__input]': '_isInFormField',
     // Native input properties that are overwritten by Angular inputs need to be synced with
     // the native input element. Otherwise property bindings for those don't work.
     '[id]': 'id',

src/material/chips/chip-input.spec.ts

@@ -141,6 +141,7 @@ describe('MatChipInput', () => {
 
     it('should set input styling classes', () => {
       expect(inputNativeElement.classList).toContain('mat-input-element');
+      expect(inputNativeElement.classList).toContain('mat-form-field-control');
       expect(inputNativeElement.classList).toContain('mat-chip-input');
     });
 

src/material/chips/chip-input.ts

@@ -8,7 +8,17 @@
 
 import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
 import {hasModifierKey, TAB} from '@angular/cdk/keycodes';
-import {Directive, ElementRef, EventEmitter, Inject, Input, OnChanges, Output} from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  Inject,
+  Input,
+  OnChanges,
+  Optional,
+  Output,
+} from '@angular/core';
+import {MatFormField, MAT_FORM_FIELD} from '@angular/material/form-field';
 import {MatChipsDefaultOptions, MAT_CHIPS_DEFAULT_OPTIONS} from './chip-default-options';
 import {MatChipList} from './chip-list';
 import {MatChipTextControl} from './chip-text-control';
@@ -101,8 +111,13 @@ export class MatChipInput implements MatChipTextControl, OnChanges {
 
   constructor(
     protected _elementRef: ElementRef<HTMLInputElement>,
-    @Inject(MAT_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatChipsDefaultOptions) {
+    @Inject(MAT_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatChipsDefaultOptions,
+    @Optional() @Inject(MAT_FORM_FIELD) formField?: MatFormField) {
     this._inputElement = this._elementRef.nativeElement as HTMLInputElement;
+
+    if (formField) {
+      this._inputElement.classList.add('mat-form-field-control');
+    }
   }
 
   ngOnChanges() {

src/material/chips/chips.scss

@@ -194,7 +194,7 @@ $mat-chip-remove-size: 18px;
   align-items: center;
   margin: -$mat-chips-chip-margin;
 
-  input.mat-input-element,
+  input.mat-form-field-control,
   .mat-standard-chip {
     margin: $mat-chips-chip-margin;
   }