angular · mmalerba · Sep 29, 2020 · Sep 24, 2020
diff --git a/src/dev-app/input/input-demo.ts b/src/dev-app/input/input-demo.ts
@@ -8,7 +8,8 @@
 
 import {ChangeDetectionStrategy, Component} from '@angular/core';
 import {FormControl, Validators} from '@angular/forms';
-import {ErrorStateMatcher, FloatLabelType} from '@angular/material/core';
+import {ErrorStateMatcher} from '@angular/material/core';
+import {FloatLabelType} from '@angular/material/form-field';
 
 
 let max = 5;

diff --git a/src/dev-app/select/select-demo.ts b/src/dev-app/select/select-demo.ts
@@ -8,7 +8,8 @@
 
 import {Component} from '@angular/core';
 import {FormControl, Validators} from '@angular/forms';
-import {ErrorStateMatcher, ThemePalette, FloatLabelType} from '@angular/material/core';
+import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
+import {FloatLabelType} from '@angular/material/form-field';
 import {MatSelectChange} from '@angular/material/select';
 
 /** Error any time control is invalid */

diff --git a/src/material-experimental/mdc-form-field/form-field.ts b/src/material-experimental/mdc-form-field/form-field.ts
@@ -28,7 +28,7 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import {NgControl} from '@angular/forms';
-import {LabelOptions, MAT_LABEL_GLOBAL_OPTIONS, ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '@angular/material/core';
 import {
   getMatFormFieldDuplicatedHintError,
   getMatFormFieldMissingControlError,
@@ -66,6 +66,7 @@ export type MatFormFieldAppearance = 'fill' | 'outline';
 export interface MatFormFieldDefaultOptions {
   appearance?: MatFormFieldAppearance;
   hideRequiredMarker?: boolean;
+  floatLabel?: FloatLabelType;
 }
 
 /**
@@ -154,8 +155,7 @@ export class MatFormField implements AfterViewInit, OnDestroy, AfterContentCheck
   /** Whether the label should always float or float as the user types. */
   @Input()
   get floatLabel(): FloatLabelType {
-    return this._floatLabel || (this._labelOptions && this._labelOptions.float)
-        || DEFAULT_FLOAT_LABEL;
+    return this._floatLabel || this._defaults?.floatLabel || DEFAULT_FLOAT_LABEL;
   }
   set floatLabel(value: FloatLabelType) {
     if (value !== this._floatLabel) {
@@ -303,7 +303,6 @@ export class MatFormField implements AfterViewInit, OnDestroy, AfterContentCheck
               private _platform: Platform,
               @Optional() @Inject(MAT_FORM_FIELD_DEFAULT_OPTIONS)
               private _defaults?: MatFormFieldDefaultOptions,
-              @Optional() @Inject(MAT_LABEL_GLOBAL_OPTIONS) private _labelOptions?: LabelOptions,
               @Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string) {
     if (_defaults && _defaults.appearance) {
       this.appearance = _defaults.appearance;

diff --git a/src/material-experimental/mdc-input/input.spec.ts b/src/material-experimental/mdc-input/input.spec.ts
@@ -30,7 +30,6 @@ import {
 } from '@angular/material-experimental/mdc-form-field';
 import {
   ErrorStateMatcher,
-  MAT_LABEL_GLOBAL_OPTIONS,
   ShowOnDirtyErrorStateMatcher,
   ThemePalette,
 } from '@angular/material/core';
@@ -51,7 +50,7 @@ describe('MatMdcInput without forms', () => {
 
   it('should default to global floating label type', fakeAsync(() => {
     let fixture = createComponent(MatInputWithLabel, [{
-      provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: {float: 'always'}
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {floatLabel: 'always'}
     }]);
     fixture.detectChanges();
 

diff --git a/src/material-experimental/mdc-select/select.spec.ts b/src/material-experimental/mdc-select/select.spec.ts
@@ -50,16 +50,17 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import {
-  ErrorStateMatcher,
-  MAT_LABEL_GLOBAL_OPTIONS,
-} from '@angular/material/core';
+import {ErrorStateMatcher} from '@angular/material/core';
 import {
   MatOption,
   MatOptionSelectionChange,
 } from '@angular/material-experimental/mdc-core';
 import {MAT_SELECT_CONFIG, MatSelectConfig} from '@angular/material/select';
-import {FloatLabelType, MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
+import {
+  FloatLabelType,
+  MatFormFieldModule,
+  MAT_FORM_FIELD_DEFAULT_OPTIONS,
+} from '@angular/material-experimental/mdc-form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
@@ -2312,8 +2313,7 @@ describe('MDC-based MatSelect', () => {
         declarations: [
           FloatLabelSelect
         ],
-        // TODO(crisbeto): switch this to use `MAT_FORM_FIELD_DEFAULT_OPTIONS` once #20479 goes in.
-        providers: [{ provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+        providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'always' } }]
       });
 
       const fixture = TestBed.createComponent(FloatLabelSelect);

diff --git a/src/material/core/common-behaviors/common-module.ts b/src/material/core/common-behaviors/common-module.ts
@@ -40,12 +40,6 @@ export interface GranularSanityChecks {
   doctype: boolean;
   theme: boolean;
   version: boolean;
-
-  /**
-   * @deprecated No longer being used.
-   * @breaking-change 10.0.0
-   */
-  hammer: boolean;
 }
 
 /**
@@ -66,13 +60,12 @@ export class MatCommonModule {
   private _sanityChecks: SanityChecks;
 
   /** Used to reference correct document/window */
-  protected _document?: Document;
+  protected _document: Document;
 
   constructor(
       highContrastModeDetector: HighContrastModeDetector,
       @Optional() @Inject(MATERIAL_SANITY_CHECKS) sanityChecks: any,
-      /** @breaking-change 11.0.0 make document required */
-      @Optional() @Inject(DOCUMENT) document?: any) {
+      @Inject(DOCUMENT) document: any) {
     this._document = document;
 
     // While A11yModule also does this, we repeat it here to avoid importing A11yModule
@@ -91,18 +84,11 @@ export class MatCommonModule {
     }
   }
 
-    /** Access injected document if available or fallback to global document reference */
-    private _getDocument(): Document | null {
-      const doc = this._document || document;
-      return typeof doc === 'object' && doc ? doc : null;
-    }
-
-    /** Use defaultView of injected document if available or fallback to global window reference */
-    private _getWindow(): Window | null {
-      const doc = this._getDocument();
-      const win = doc?.defaultView || window;
-      return typeof win === 'object' && win ? win : null;
-    }
+  /** Use defaultView of injected document if available or fallback to global window reference */
+  private _getWindow(): Window | null {
+    const win = this._document.defaultView || window;
+    return typeof win === 'object' && win ? win : null;
+  }
 
   /** Whether any sanity checks are enabled. */
   private _checksAreEnabled(): boolean {
@@ -122,9 +108,8 @@ export class MatCommonModule {
   private _checkDoctypeIsDefined(): void {
     const isEnabled = this._checksAreEnabled() &&
       (this._sanityChecks === true || (this._sanityChecks as GranularSanityChecks).doctype);
-    const document = this._getDocument();
 
-    if (isEnabled && document && !document.doctype) {
+    if (isEnabled && !this._document.doctype) {
       console.warn(
         'Current document does not have a doctype. This may cause ' +
         'some Angular Material components not to behave as expected.'
@@ -137,17 +122,15 @@ export class MatCommonModule {
     // and the `body` won't be defined if the consumer put their scripts in the `head`.
     const isDisabled = !this._checksAreEnabled() ||
       (this._sanityChecks === false || !(this._sanityChecks as GranularSanityChecks).theme);
-    const document = this._getDocument();
 
-    if (isDisabled || !document || !document.body ||
-        typeof getComputedStyle !== 'function') {
+    if (isDisabled || !this._document.body || typeof getComputedStyle !== 'function') {
       return;
     }
 
-    const testElement = document.createElement('div');
+    const testElement = this._document.createElement('div');
 
     testElement.classList.add('mat-theme-loaded-marker');
-    document.body.appendChild(testElement);
+    this._document.body.appendChild(testElement);
 
     const computedStyle = getComputedStyle(testElement);
 
@@ -162,7 +145,7 @@ export class MatCommonModule {
       );
     }
 
-    document.body.removeChild(testElement);
+    this._document.body.removeChild(testElement);
   }
 
   /** Checks whether the material version matches the cdk version */

diff --git a/src/material/core/datetime/date-adapter.ts b/src/material/core/datetime/date-adapter.ts
@@ -20,14 +20,6 @@ export function MAT_DATE_LOCALE_FACTORY(): string {
   return inject(LOCALE_ID);
 }
 
-/**
- * No longer needed since MAT_DATE_LOCALE has been changed to a scoped injectable.
- * If you are importing and providing this in your code you can simply remove it.
- * @deprecated
- * @breaking-change 8.0.0
- */
-export const MAT_DATE_LOCALE_PROVIDER = {provide: MAT_DATE_LOCALE, useExisting: LOCALE_ID};
-
 /** Adapts type `D` to be usable as a date by cdk-based components that work with dates. */
 export abstract class DateAdapter<D> {
   /** The locale to use for all dates. */

diff --git a/src/material/core/label/label-options.ts b/src/material/core/label/label-options.ts
diff --git a/src/material/core/line/line.ts b/src/material/core/line/line.ts
@@ -54,18 +54,6 @@ function setClass(element: ElementRef<HTMLElement>, className: string, isAdd: bo
   isAdd ? classList.add(className) : classList.remove(className);
 }
 
-/**
- * Helper that takes a query list of lines and sets the correct class on the host.
- * @docs-private
- * @deprecated Use `setLines` instead.
- * @breaking-change 8.0.0
- */
-export class MatLineSetter {
-  constructor(lines: QueryList<MatLine>, element: ElementRef<HTMLElement>) {
-    setLines(lines, element);
-  }
-}
-
 @NgModule({
   imports: [MatCommonModule],
   exports: [MatLine, MatCommonModule],

diff --git a/src/material/core/public-api.ts b/src/material/core/public-api.ts
@@ -13,6 +13,5 @@ export * from './datetime/index';
 export * from './error/error-options';
 export * from './line/line';
 export * from './option/index';
-export * from './label/label-options';
 export * from './ripple/index';
 export * from './selection/index';
diff --git a/src/material/form-field/form-field.ts b/src/material/form-field/form-field.ts
@@ -30,8 +30,6 @@ import {
 } from '@angular/core';
 import {
   CanColor, CanColorCtor,
-  LabelOptions,
-  MAT_LABEL_GLOBAL_OPTIONS,
   mixinColor,
 } from '@angular/material/core';
 import {fromEvent, merge, Subject} from 'rxjs';
@@ -160,7 +158,6 @@ export const MAT_FORM_FIELD = new InjectionToken<MatFormField>('MatFormField');
 
 export class MatFormField extends _MatFormFieldMixinBase
     implements AfterContentInit, AfterContentChecked, AfterViewInit, OnDestroy, CanColor {
-  private _labelOptions: LabelOptions;
 
   /**
    * Whether the outline gap needs to be calculated
@@ -280,14 +277,19 @@ export class MatFormField extends _MatFormFieldMixinBase
 
   constructor(
       public _elementRef: ElementRef, private _changeDetectorRef: ChangeDetectorRef,
-      @Optional() @Inject(MAT_LABEL_GLOBAL_OPTIONS) labelOptions: LabelOptions,
+      /**
+       * @deprecated `_labelOptions` parameter no longer being used. To be removed.
+       * @breaking-change 12.0.0
+       */
+      @Inject(ElementRef)
+          // Use `ElementRef` here so Angular has something to inject.
+          _labelOptions: any,
       @Optional() private _dir: Directionality,
       @Optional() @Inject(MAT_FORM_FIELD_DEFAULT_OPTIONS) private _defaults:
           MatFormFieldDefaultOptions, private _platform: Platform, private _ngZone: NgZone,
       @Optional() @Inject(ANIMATION_MODULE_TYPE) _animationMode: string) {
     super(_elementRef);
 
-    this._labelOptions = labelOptions ? labelOptions : {};
     this.floatLabel = this._getDefaultFloatLabelState();
     this._animationsEnabled = _animationMode !== 'NoopAnimations';
 
@@ -492,7 +494,7 @@ export class MatFormField extends _MatFormFieldMixinBase
 
   /** Gets the default float label state. */
   private _getDefaultFloatLabelState(): FloatLabelType {
-    return (this._defaults && this._defaults.floatLabel) || this._labelOptions.float || 'auto';
+    return (this._defaults && this._defaults.floatLabel) || 'auto';
   }
 
   /**

diff --git a/src/material/input/input.spec.ts b/src/material/input/input.spec.ts
@@ -28,8 +28,6 @@ import {
 } from '@angular/forms';
 import {
   ErrorStateMatcher,
-  FloatLabelType,
-  MAT_LABEL_GLOBAL_OPTIONS,
   ShowOnDirtyErrorStateMatcher,
   ThemePalette,
 } from '@angular/material/core';
@@ -41,6 +39,7 @@ import {
   MatFormField,
   MatFormFieldAppearance,
   MatFormFieldModule,
+  FloatLabelType,
 } from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -62,18 +61,6 @@ describe('MatInput without forms', () => {
         'Expected MatInput to set floatingLabel to auto by default.');
   }));
 
-  it('should default to floating label type from deprecated global label options', fakeAsync(() => {
-    let fixture = createComponent(MatInputWithId, [{
-      provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: {float: 'always'}
-    }]);
-    fixture.detectChanges();
-
-    let formField = fixture.debugElement.query(By.directive(MatFormField))!
-        .componentInstance as MatFormField;
-    expect(formField.floatLabel).toBe('always',
-      'Expected MatInput to set floatingLabel to always from global option.');
-  }));
-
   it('should default to floating label type provided by global default options', fakeAsync(() => {
     let fixture = createComponent(MatInputWithId, [{
       provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: {floatLabel: 'always'}

diff --git a/src/material/schematics/ng-update/data/constructor-checks.ts b/src/material/schematics/ng-update/data/constructor-checks.ts
@@ -34,6 +34,10 @@ export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
     {
       pr: 'https://github.com/angular/components/pull/20499',
       changes: ['MatPaginatedTabHeader', 'MatTabBodyPortal', 'MatTabNav', 'MatTab']
+    },
+    {
+      pr: 'https://github.com/angular/components/pull/20479',
+      changes: ['MatCommonModule']
     }
   ],
   [TargetVersion.V10]: [