Skip to content

Commit 0ac0290

Browse files
kseamonAndrew Seguin
authored and
Andrew Seguin
committed
perf(multiple): Don't double-inject the style loader. (#30467)
inject() is pretty cheap, but not free. (cherry picked from commit 1ddb9cf)
1 parent 30137c0 commit 0ac0290

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/material/badge/badge.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,9 @@ export class MatBadge implements OnInit, OnDestroy {
151151
constructor(...args: unknown[]);
152152

153153
constructor() {
154-
inject(_CdkPrivateStyleLoader).load(_MatBadgeStyleLoader);
155-
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
154+
const styleLoader = inject(_CdkPrivateStyleLoader);
155+
styleLoader.load(_MatBadgeStyleLoader);
156+
styleLoader.load(_VisuallyHiddenLoader);
156157

157158
if (typeof ngDevMode === 'undefined' || ngDevMode) {
158159
const nativeElement = this._elementRef.nativeElement;

src/material/chips/chip.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,9 @@ export class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck
242242
constructor(...args: unknown[]);
243243

244244
constructor() {
245-
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
246-
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
245+
const styleLoader = inject(_CdkPrivateStyleLoader);
246+
styleLoader.load(_StructuralStylesLoader);
247+
styleLoader.load(_VisuallyHiddenLoader);
247248
const animationMode = inject(ANIMATION_MODULE_TYPE, {optional: true});
248249
this._animationsDisabled = animationMode === 'NoopAnimations';
249250
this._monitorFocus();

src/material/core/option/option.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ export class MatOption<T = any> implements FocusableOption, AfterViewChecked, On
139139

140140
constructor(...args: unknown[]);
141141
constructor() {
142-
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
143-
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
142+
const styleLoader = inject(_CdkPrivateStyleLoader);
143+
styleLoader.load(_StructuralStylesLoader);
144+
styleLoader.load(_VisuallyHiddenLoader);
144145
this._signalDisableRipple = !!this._parent && isSignal(this._parent.disableRipple);
145146
}
146147

src/material/stepper/step-header.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ export class MatStepHeader extends CdkStepHeader implements AfterViewInit, OnDes
8888
constructor() {
8989
super();
9090

91-
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
92-
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
91+
const styleLoader = inject(_CdkPrivateStyleLoader);
92+
styleLoader.load(_StructuralStylesLoader);
93+
styleLoader.load(_VisuallyHiddenLoader);
9394
const changeDetectorRef = inject(ChangeDetectorRef);
9495
this._intlSubscription = this._intl.changes.subscribe(() => changeDetectorRef.markForCheck());
9596
}

0 commit comments

Comments
 (0)