refactor(material/legacy-form-field): rename ts symbols

Author: wagnermaciel

src/dev-app/legacy-input/legacy-input-demo.ts

@@ -14,7 +14,7 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
 import {MatLegacyCardModule} from '@angular/material/legacy-card';
 import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
 import {ErrorStateMatcher} from '@angular/material/core';
-import {FloatLabelType, MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
+import {LegacyFloatLabelType, MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
 import {MatIconModule} from '@angular/material/icon';
 import {MatLegacyInputModule} from '@angular/material/legacy-input';
 import {MatLegacySelectModule} from '@angular/material/legacy-select';
@@ -48,7 +48,7 @@ const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA
   ],
 })
 export class LegacyInputDemo {
-  floatingLabel: FloatLabelType = 'auto';
+  floatingLabel: LegacyFloatLabelType = 'auto';
   color: boolean;
   requiredField: boolean;
   hideRequiredMarker: boolean;

src/dev-app/legacy-select/legacy-select-demo.html

@@ -241,7 +241,7 @@
           </mat-select>
         </mat-form-field>
 
-        <p> Change event value: {{ latestChangeEvent?.value }} </p>
+        <p> Change event value: {{ latestChangeEvent.value }} </p>
       </mat-card-content>
     </mat-card>
   </div>

src/dev-app/legacy-select/legacy-select-demo.ts

@@ -13,7 +13,7 @@ import {MatLegacyButtonModule} from '@angular/material/legacy-button';
 import {MatLegacyCardModule} from '@angular/material/legacy-card';
 import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
 import {MatLegacyDialog, MatLegacyDialogModule} from '@angular/material/legacy-dialog';
-import {FloatLabelType, MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
+import {LegacyFloatLabelType, MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
 import {MatIconModule} from '@angular/material/icon';
 import {MatLegacyInputModule} from '@angular/material/legacy-input';
 import {MatSelectChange, MatLegacySelectModule} from '@angular/material/legacy-select';
@@ -59,8 +59,8 @@ export class LegacySelectDemo {
   currentPokemonFromGroup: string;
   currentDigimon: string;
   currentAppearanceValue: string | null;
-  latestChangeEvent: MatSelectChange | undefined;
-  floatLabel: FloatLabelType = 'auto';
+  latestChangeEvent: MatSelectChange;
+  floatLabel: LegacyFloatLabelType = 'auto';
   drinksWidth = 'default';
   foodControl = new FormControl('pizza-1');
   topHeightCtrl = new FormControl(0);

src/material/datepicker/date-range-input.ts

@@ -25,7 +25,7 @@ import {
 import {
   MatLegacyFormFieldControl,
   MatLegacyFormField,
-  MAT_FORM_FIELD,
+  MAT_LEGACY_FORM_FIELD,
 } from '@angular/material/legacy-form-field';
 import {ThemePalette, DateAdapter} from '@angular/material/core';
 import {NgControl, ControlContainer} from '@angular/forms';
@@ -259,7 +259,7 @@ export class MatDateRangeInput<D>
     private _elementRef: ElementRef<HTMLElement>,
     @Optional() @Self() control: ControlContainer,
     @Optional() private _dateAdapter: DateAdapter<D>,
-    @Optional() @Inject(MAT_FORM_FIELD) private _formField?: MatLegacyFormField,
+    @Optional() @Inject(MAT_LEGACY_FORM_FIELD) private _formField?: MatLegacyFormField,
   ) {
     if (!_dateAdapter && (typeof ngDevMode === 'undefined' || ngDevMode)) {
       throw createMissingDateImplError('DateAdapter');

src/material/datepicker/datepicker-input.ts

@@ -9,7 +9,7 @@
 import {Directive, ElementRef, forwardRef, Inject, Input, OnDestroy, Optional} from '@angular/core';
 import {NG_VALIDATORS, NG_VALUE_ACCESSOR, ValidatorFn, Validators} from '@angular/forms';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats, ThemePalette} from '@angular/material/core';
-import {MatLegacyFormField, MAT_FORM_FIELD} from '@angular/material/legacy-form-field';
+import {MatLegacyFormField, MAT_LEGACY_FORM_FIELD} from '@angular/material/legacy-form-field';
 import {MAT_INPUT_VALUE_ACCESSOR} from '@angular/material/legacy-input';
 import {Subscription} from 'rxjs';
 import {MatDatepickerInputBase, DateFilterFn} from './datepicker-input-base';
@@ -124,7 +124,7 @@ export class MatDatepickerInput<D>
     elementRef: ElementRef<HTMLInputElement>,
     @Optional() dateAdapter: DateAdapter<D>,
     @Optional() @Inject(MAT_DATE_FORMATS) dateFormats: MatDateFormats,
-    @Optional() @Inject(MAT_FORM_FIELD) private _formField?: MatLegacyFormField,
+    @Optional() @Inject(MAT_LEGACY_FORM_FIELD) private _formField?: MatLegacyFormField,
   ) {
     super(elementRef, dateAdapter, dateFormats);
     this._validator = Validators.compose(super._getValidators());

src/material/legacy-form-field/form-field.ts

@@ -32,7 +32,7 @@ import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
 import {fromEvent, merge, Subject} from 'rxjs';
 import {startWith, take, takeUntil} from 'rxjs/operators';
 import {MatLegacyError} from './error';
-import {_MAT_HINT, MatLegacyHint} from './hint';
+import {_MAT_LEGACY_HINT, MatLegacyHint} from './hint';
 import {MatLegacyLabel} from './label';
 import {MatLegacyPlaceholder} from './placeholder';
 import {MatLegacyPrefix} from './prefix';
@@ -71,7 +71,7 @@ const _MatFormFieldBase = mixinColor(
 export type MatLegacyFormFieldAppearance = 'legacy' | 'standard' | 'fill' | 'outline';
 
 /** Possible values for the "floatLabel" form field input. */
-export type FloatLabelType = 'always' | 'never' | 'auto';
+export type LegacyFloatLabelType = 'always' | 'never' | 'auto';
 
 /**
  * Represents the default options for the form field that can be configured
@@ -88,16 +88,15 @@ export interface MatLegacyFormFieldDefaultOptions {
    * Whether the label for form fields should by default float `always`,
    * `never`, or `auto` (only when necessary).
    */
-  floatLabel?: FloatLabelType;
+  floatLabel?: LegacyFloatLabelType;
 }
 
 /**
  * Injection token that can be used to configure the
  * default options for all form field within an app.
  */
-export const MAT_FORM_FIELD_DEFAULT_OPTIONS = new InjectionToken<MatLegacyFormFieldDefaultOptions>(
-  'MAT_FORM_FIELD_DEFAULT_OPTIONS',
-);
+export const MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS =
+  new InjectionToken<MatLegacyFormFieldDefaultOptions>('MAT_FORM_FIELD_DEFAULT_OPTIONS');
 
 /** Container for form controls that applies Material Design styling and behavior. */
 @Component({
@@ -227,16 +226,16 @@ export class MatLegacyFormField
    * appearances the `never` option has been disabled in favor of just using the placeholder.
    */
   @Input()
-  get floatLabel(): FloatLabelType {
+  get floatLabel(): LegacyFloatLabelType {
     return this.appearance !== 'legacy' && this._floatLabel === 'never' ? 'auto' : this._floatLabel;
   }
-  set floatLabel(value: FloatLabelType) {
+  set floatLabel(value: LegacyFloatLabelType) {
     if (value !== this._floatLabel) {
       this._floatLabel = value || this._getDefaultFloatLabelState();
       this._changeDetectorRef.markForCheck();
     }
   }
-  private _floatLabel: FloatLabelType;
+  private _floatLabel: LegacyFloatLabelType;
 
   /** Whether the Angular animations are enabled. */
   _animationsEnabled: boolean;
@@ -262,7 +261,7 @@ export class MatLegacyFormField
   @ContentChild(MatLegacyPlaceholder) _placeholderChild: MatLegacyPlaceholder;
 
   @ContentChildren(MAT_ERROR, {descendants: true}) _errorChildren: QueryList<MatLegacyError>;
-  @ContentChildren(_MAT_HINT, {descendants: true}) _hintChildren: QueryList<MatLegacyHint>;
+  @ContentChildren(_MAT_LEGACY_HINT, {descendants: true}) _hintChildren: QueryList<MatLegacyHint>;
   @ContentChildren(MAT_PREFIX, {descendants: true})
   _prefixChildren: QueryList<MatLegacyPrefix>;
   @ContentChildren(MAT_SUFFIX, {descendants: true})
@@ -273,7 +272,7 @@ export class MatLegacyFormField
     private _changeDetectorRef: ChangeDetectorRef,
     @Optional() private _dir: Directionality,
     @Optional()
-    @Inject(MAT_FORM_FIELD_DEFAULT_OPTIONS)
+    @Inject(MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS)
     private _defaults: MatLegacyFormFieldDefaultOptions,
     private _platform: Platform,
     private _ngZone: NgZone,
@@ -501,7 +500,7 @@ export class MatLegacyFormField
   }
 
   /** Gets the default float label state. */
-  private _getDefaultFloatLabelState(): FloatLabelType {
+  private _getDefaultFloatLabelState(): LegacyFloatLabelType {
     return (this._defaults && this._defaults.floatLabel) || 'auto';
   }
 

src/material/legacy-form-field/hint.ts

@@ -18,7 +18,7 @@ let nextUniqueId = 0;
  * *Note*: This is not part of the public API as the MDC-based form-field will not
  * need a lightweight token for `MatHint` and we want to reduce breaking changes.
  */
-export const _MAT_HINT = new InjectionToken<MatLegacyHint>('MatHint');
+export const _MAT_LEGACY_HINT = new InjectionToken<MatLegacyHint>('MatHint');
 
 /** Hint text to be shown underneath the form field control. */
 @Directive({
@@ -30,7 +30,7 @@ export const _MAT_HINT = new InjectionToken<MatLegacyHint>('MatHint');
     // Remove align attribute to prevent it from interfering with layout.
     '[attr.align]': 'null',
   },
-  providers: [{provide: _MAT_HINT, useExisting: MatLegacyHint}],
+  providers: [{provide: _MAT_LEGACY_HINT, useExisting: MatLegacyHint}],
 })
 export class MatLegacyHint {
   /** Whether to align the hint label at the start or end of the line. */

src/material/legacy-form-field/public-api.ts

@@ -6,23 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './form-field-module';
-export * from './error';
-export * from './form-field';
-export * from './hint';
-export * from './placeholder';
-export * from './prefix';
-export * from './suffix';
-export * from './label';
+export {MatLegacyFormFieldModule} from './form-field-module';
+export {MatLegacyError} from './error';
+export {
+  MatLegacyFormFieldAppearance,
+  LegacyFloatLabelType,
+  MatLegacyFormFieldDefaultOptions,
+  MAT_LEGACY_FORM_FIELD_DEFAULT_OPTIONS,
+  MatLegacyFormField,
+} from './form-field';
+export {_MAT_LEGACY_HINT, MatLegacyHint} from './hint';
+export {MatLegacyPlaceholder} from './placeholder';
+export {MatLegacyPrefix} from './prefix';
+export {MatLegacySuffix} from './suffix';
+export {MatLegacyLabel} from './label';
 
 export {
-  MAT_FORM_FIELD,
+  MAT_FORM_FIELD as MAT_LEGACY_FORM_FIELD,
   MatFormFieldControl as MatLegacyFormFieldControl,
-  getMatFormFieldDuplicatedHintError,
-  getMatFormFieldMissingControlError,
-  getMatFormFieldPlaceholderConflictError,
-  matFormFieldAnimations,
-  MAT_SUFFIX,
-  MAT_ERROR,
-  MAT_PREFIX,
+  getMatFormFieldDuplicatedHintError as getMatLegacyFormFieldDuplicatedHintError,
+  getMatFormFieldMissingControlError as getMatLegacyFormFieldMissingControlError,
+  getMatFormFieldPlaceholderConflictError as getMatLegacyFormFieldPlaceholderConflictError,
+  matFormFieldAnimations as matLegacyFormFieldAnimations,
+  MAT_SUFFIX as MAT_LEGACY_SUFFIX,
+  MAT_ERROR as MAT_LEGACY_ERROR,
+  MAT_PREFIX as MAT_LEGACY_PREFIX,
 } from '@angular/material/form-field';

src/material/legacy-form-field/testing/form-field-harness.ts

@@ -20,14 +20,14 @@ import {MatLegacySelectHarness} from '@angular/material/legacy-select/testing';
 
 // TODO(devversion): support support chip list harness
 /** Possible harnesses of controls which can be bound to a form-field. */
-export type FormFieldControlHarness =
+export type LegacyFormFieldControlHarness =
   | MatLegacyInputHarness
   | MatLegacySelectHarness
   | MatDatepickerInputHarness
   | MatDateRangeInputHarness;
 
 /** Harness for interacting with a standard Material form-field's in tests. */
-export class MatLegacyFormFieldHarness extends _MatFormFieldHarnessBase<FormFieldControlHarness> {
+export class MatLegacyFormFieldHarness extends _MatFormFieldHarnessBase<LegacyFormFieldControlHarness> {
   static hostSelector = '.mat-form-field';
 
   /**

src/material/legacy-form-field/testing/public-api.ts

@@ -9,7 +9,7 @@
 // Re-export the base control harness from the "form-field/testing/control" entry-point. To
 // avoid circular dependencies, harnesses for form-field controls (i.e. input, select)
 // need to import the base form-field control harness through a separate entry-point.
-export {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+export {MatFormFieldControlHarness as MatLegacyFormFieldControlHarness} from '@angular/material/form-field/testing/control';
 
-export * from './form-field-harness';
-export {FormFieldHarnessFilters} from '@angular/material/form-field/testing';
+export {LegacyFormFieldControlHarness, MatLegacyFormFieldHarness} from './form-field-harness';
+export {FormFieldHarnessFilters as LegacyFormFieldHarnessFilters} from '@angular/material/form-field/testing';