Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/material/form-field/form-field.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</div>

<!-- Underline used for legacy, standard, and box appearances. -->
<div class="mat-form-field-underline" #underline
<div class="mat-form-field-underline"
*ngIf="appearance != 'outline'">
<span class="mat-form-field-ripple"
[class.mat-accent]="color == 'accent'"
Expand Down
13 changes: 0 additions & 13 deletions src/material/form-field/form-field.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,6 @@ export class MatFormField extends _MatFormFieldBase
/** Whether the Angular animations are enabled. */
_animationsEnabled: boolean;

/**
* @deprecated
* @breaking-change 8.0.0
*/
@ViewChild('underline') underlineRef: ElementRef;

@ViewChild('connectionContainer', {static: true}) _connectionContainerRef: ElementRef;
@ViewChild('inputContainer') _inputContainerRef: ElementRef;
@ViewChild('label') private _label: ElementRef<HTMLElement>;
Expand Down Expand Up @@ -268,13 +262,6 @@ export class MatFormField extends _MatFormFieldBase

constructor(
elementRef: ElementRef, private _changeDetectorRef: ChangeDetectorRef,
/**
* @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,
Expand Down
20 changes: 0 additions & 20 deletions src/material/form-field/testing/form-field-harness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,32 +134,12 @@ export abstract class _MatFormFieldHarnessBase<ControlHarness extends MatFormFie
return parallel(() => hints.map(e => e.text()));
}

/**
* Gets a reference to the container element which contains all projected
* prefixes of the form-field.
* @deprecated Use `getPrefixText` instead.
* @breaking-change 11.0.0
*/
async getHarnessLoaderForPrefix(): Promise<TestElement|null> {
return this._prefixContainer();
}

/** Gets the text inside the prefix element. */
async getPrefixText(): Promise<string> {
const prefix = await this._prefixContainer();
return prefix ? prefix.text() : '';
}

/**
* Gets a reference to the container element which contains all projected
* suffixes of the form-field.
* @deprecated Use `getSuffixText` instead.
* @breaking-change 11.0.0
*/
async getHarnessLoaderForSuffix(): Promise<TestElement|null> {
return this._suffixContainer();
}

/** Gets the text inside the suffix element. */
async getSuffixText(): Promise<string> {
const suffix = await this._suffixContainer();
Expand Down
6 changes: 6 additions & 0 deletions src/material/schematics/ng-update/data/constructor-checks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ import {ConstructorChecksUpgradeData, TargetVersion, VersionChanges} from '@angu
* automatically through type checking.
*/
export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
[TargetVersion.V13]: [
{
pr: 'https://github.com/angular/components/pull/23389',
changes: ['MatFormField']
}
],
[TargetVersion.V12]: [
{
pr: 'https://github.com/angular/components/pull/21897',
Expand Down
4 changes: 0 additions & 4 deletions tools/public_api_guard/material/form-field-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ export abstract class _MatFormFieldHarnessBase<ControlHarness extends MatFormFie
getControl(): Promise<ControlHarness | null>;
getControl<X extends MatFormFieldControlHarness>(type: ComponentHarnessConstructor<X>): Promise<X | null>;
getControl<X extends MatFormFieldControlHarness>(type: HarnessPredicate<X>): Promise<X | null>;
// @deprecated
getHarnessLoaderForPrefix(): Promise<TestElement | null>;
// @deprecated
getHarnessLoaderForSuffix(): Promise<TestElement | null>;
getLabel(): Promise<string | null>;
getPrefixText(): Promise<string>;
getSuffixText(): Promise<string>;
Expand Down
7 changes: 2 additions & 5 deletions tools/public_api_guard/material/form-field.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ export class MatError {

// @public
export class MatFormField extends _MatFormFieldBase implements AfterContentInit, AfterContentChecked, AfterViewInit, OnDestroy, CanColor {
constructor(elementRef: ElementRef, _changeDetectorRef: ChangeDetectorRef,
_labelOptions: any, _dir: Directionality, _defaults: MatFormFieldDefaultOptions, _platform: Platform, _ngZone: NgZone, _animationMode: string);
constructor(elementRef: ElementRef, _changeDetectorRef: ChangeDetectorRef, _dir: Directionality, _defaults: MatFormFieldDefaultOptions, _platform: Platform, _ngZone: NgZone, _animationMode: string);
_animateAndLockLabel(): void;
_animationsEnabled: boolean;
get appearance(): MatFormFieldAppearance;
Expand Down Expand Up @@ -140,14 +139,12 @@ export class MatFormField extends _MatFormFieldBase implements AfterContentInit,
_subscriptAnimationState: string;
// (undocumented)
_suffixChildren: QueryList<MatSuffix>;
// @deprecated (undocumented)
underlineRef: ElementRef;
updateOutlineGap(): void;
protected _validateControlChild(): void;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatFormField, "mat-form-field", ["matFormField"], { "color": "color"; "appearance": "appearance"; "hideRequiredMarker": "hideRequiredMarker"; "hintLabel": "hintLabel"; "floatLabel": "floatLabel"; }, {}, ["_controlNonStatic", "_controlStatic", "_labelChildNonStatic", "_labelChildStatic", "_placeholderChild", "_errorChildren", "_hintChildren", "_prefixChildren", "_suffixChildren"], ["[matPrefix]", "*", "mat-placeholder", "mat-label", "[matSuffix]", "mat-error", "mat-hint:not([align='end'])", "mat-hint[align='end']"]>;
// (undocumented)
static ɵfac: i0.ɵɵFactoryDeclaration<MatFormField, [null, null, null, { optional: true; }, { optional: true; }, null, null, { optional: true; }]>;
static ɵfac: i0.ɵɵFactoryDeclaration<MatFormField, [null, null, { optional: true; }, { optional: true; }, null, null, { optional: true; }]>;
}

// @public
Expand Down