Skip to content

perf(material/form-field): set notch outline variable only on relevant element #30955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

perf(material/form-field): set notch outline variable only on relevant element #30955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/material/form-field/_mdc-text-field-structure.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,15 +458,16 @@ $token-slots: m2-form-field.get-token-slots();
}

.mdc-notched-outline__notch {
$min-value: 'calc(100% - max(12px, #{token-utils.slot(outlined-container-shape)}) * 2)';
flex: 0 0 auto;
width: auto;

.mdc-text-field--outlined .mdc-notched-outline & {
$shape-var: token-utils.slot(outlined-container-shape);
max-width: min(
var(--mat-form-field-notch-max-width, 100%),
calc(100% - max(12px, #{$shape-var}) * 2)
);
max-width: min(var(--mat-form-field-notch-max-width, 100%), #{$min-value});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--mat-form-field-notch-max-width looks like a token, but I assume its just internal-only. Seems like we should have a different shape of variables that are private. Like --_mat_private- or something

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah not really a token, just an implementation detail.

}

.mdc-text-field--outlined .mdc-notched-outline--notched & {
max-width: min(100%, #{$min-value});
}

.mdc-text-field--outlined .mdc-notched-outline--notched & {
Expand All @@ -481,7 +482,6 @@ $token-slots: m2-form-field.get-token-slots();
padding-left: 0;
padding-right: 8px;
border-top: none;
--mat-form-field-notch-max-width: 100%;
}

[dir='rtl'] .mdc-notched-outline--notched & {
Expand Down
27 changes: 18 additions & 9 deletions src/material/form-field/directives/notched-outline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,14 @@ export class MatFormFieldNotchedOutline implements AfterViewInit {
/** Whether the notch should be opened. */
@Input('matFormFieldNotchedOutlineOpen') open: boolean = false;

@ViewChild('notch') _notch: ElementRef;

constructor(...args: unknown[]);
constructor() {}
@ViewChild('notch') _notch: ElementRef<HTMLElement>;

ngAfterViewInit(): void {
const label = this._elementRef.nativeElement.querySelector<HTMLElement>('.mdc-floating-label');
const element = this._elementRef.nativeElement;
const label = element.querySelector<HTMLElement>('.mdc-floating-label');

if (label) {
this._elementRef.nativeElement.classList.add('mdc-notched-outline--upgraded');
element.classList.add('mdc-notched-outline--upgraded');

if (typeof requestAnimationFrame === 'function') {
label.style.transitionDuration = '0s';
Expand All @@ -60,19 +59,29 @@ export class MatFormFieldNotchedOutline implements AfterViewInit {
});
}
} else {
this._elementRef.nativeElement.classList.add('mdc-notched-outline--no-label');
element.classList.add('mdc-notched-outline--no-label');
}
}

_setNotchWidth(labelWidth: number) {
const notch = this._notch.nativeElement;

if (!this.open || !labelWidth) {
this._notch.nativeElement.style.width = '';
notch.style.width = '';
} else {
const NOTCH_ELEMENT_PADDING = 8;
const NOTCH_ELEMENT_BORDER = 1;
this._notch.nativeElement.style.width = `calc(${labelWidth}px * var(--mat-mdc-form-field-floating-label-scale, 0.75) + ${
notch.style.width = `calc(${labelWidth}px * var(--mat-mdc-form-field-floating-label-scale, 0.75) + ${
NOTCH_ELEMENT_PADDING + NOTCH_ELEMENT_BORDER
}px)`;
}
}

_setMaxWidth(prefixAndSuffixWidth: number) {
// Set this only on the notch to avoid style recalculations in other parts of the form field.
this._notch.nativeElement.style.setProperty(
'--mat-form-field-notch-max-width',
`calc(100% - ${prefixAndSuffixWidth}px)`,
);
}
}
6 changes: 2 additions & 4 deletions src/material/form-field/form-field.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,8 @@ export class MatFormField
textPrefixContainerWidth +
iconSuffixContainerWidth +
textSuffixContainerWidth;
this._elementRef.nativeElement.style.setProperty(
'--mat-form-field-notch-max-width',
`calc(100% - ${prefixAndSuffixWidth}px)`,
);

this._notchedOutline?._setMaxWidth(prefixAndSuffixWidth);
}

/** Checks whether the form field is attached to the DOM. */
Expand Down
Loading