Skip to content

Commit 57d9a2f

Browse files
authored
refactor(multiple): remove visually hidden styles from core (#29812)
1 parent a72648c commit 57d9a2f

File tree

12 files changed

+26
-10
lines changed

12 files changed

+26
-10
lines changed

Diff for: src/cdk/a11y/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ng_module(
2424
"//src/cdk/layout",
2525
"//src/cdk/observers",
2626
"//src/cdk/platform",
27+
"//src/cdk/private",
2728
"@npm//@angular/core",
2829
"@npm//rxjs",
2930
],

Diff for: src/cdk/a11y/aria-describer/aria-describer.ts

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {DOCUMENT} from '@angular/common';
1010
import {Injectable, OnDestroy, APP_ID, inject} from '@angular/core';
1111
import {Platform} from '@angular/cdk/platform';
1212
import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
13+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
1314

1415
/**
1516
* Interface used to register message elements and keep a count of how many registrations have
@@ -69,6 +70,7 @@ export class AriaDescriber implements OnDestroy {
6970
constructor(...args: unknown[]);
7071

7172
constructor() {
73+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
7274
this._id = inject(APP_ID) + '-' + nextId++;
7375
}
7476

Diff for: src/cdk/a11y/focus-trap/focus-trap.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
inject,
2626
} from '@angular/core';
2727
import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
28+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
2829

2930
/**
3031
* Class that allows for trapping focus within a DOM element.
@@ -378,7 +379,9 @@ export class FocusTrapFactory {
378379
private _injector = inject(Injector);
379380

380381
constructor(...args: unknown[]);
381-
constructor() {}
382+
constructor() {
383+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
384+
}
382385

383386
/**
384387
* Creates a focus-trapped region around the given element.

Diff for: src/cdk/a11y/live-announcer/live-announcer.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
LIVE_ANNOUNCER_ELEMENT_TOKEN,
1717
LIVE_ANNOUNCER_DEFAULT_OPTIONS,
1818
} from './live-announcer-tokens';
19+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
1920

2021
let uniqueIds = 0;
2122

@@ -255,7 +256,9 @@ export class CdkAriaLive implements OnDestroy {
255256

256257
constructor(...args: unknown[]);
257258

258-
constructor() {}
259+
constructor() {
260+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
261+
}
259262

260263
ngOnDestroy() {
261264
if (this._subscription) {

Diff for: src/material/badge/badge.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
ANIMATION_MODULE_TYPE,
2525
} from '@angular/core';
2626
import {ThemePalette} from '@angular/material/core';
27-
import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
27+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
2828

2929
let nextId = 0;
3030

@@ -156,6 +156,7 @@ export class MatBadge implements OnInit, OnDestroy {
156156

157157
constructor() {
158158
inject(_CdkPrivateStyleLoader).load(_MatBadgeStyleLoader);
159+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
159160

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

Diff for: src/material/chips/chip.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {Subject, Subscription, merge} from 'rxjs';
4444
import {MatChipAction} from './chip-action';
4545
import {MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
4646
import {MAT_CHIP, MAT_CHIP_AVATAR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON} from './tokens';
47-
import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
47+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
4848

4949
let uid = 0;
5050

@@ -246,6 +246,7 @@ export class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck
246246

247247
constructor() {
248248
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
249+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
249250
const animationMode = inject(ANIMATION_MODULE_TYPE, {optional: true});
250251
this._animationsDisabled = animationMode === 'NoopAnimations';
251252
this._monitorFocus();

Diff for: src/material/core/_core.scss

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
@use '@angular/cdk';
21
@use './tokens/m2/mat/app' as tokens-mat-app;
32
@use './tokens/token-utils';
43
@use './style/elevation';
54

65
// Mixin that renders all of the core styles that are not theme-dependent.
7-
@mixin core() {
8-
@include cdk.a11y-visually-hidden();
9-
}
6+
@mixin core() {}
107

118
// Emits the mat-app-background CSS class. This predefined class sets the
129
// background color and text color of an element.

Diff for: src/material/core/option/option.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {MatOptionParentComponent, MAT_OPTION_PARENT_COMPONENT} from './option-pa
3232
import {MatRipple} from '../ripple/ripple';
3333
import {MatPseudoCheckbox} from '../selection/pseudo-checkbox/pseudo-checkbox';
3434
import {_StructuralStylesLoader} from '../focus-indicators/structural-styles';
35-
import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
35+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
3636

3737
/**
3838
* Option IDs need to be unique across components, so this counter exists outside of
@@ -146,6 +146,7 @@ export class MatOption<T = any> implements FocusableOption, AfterViewChecked, On
146146
constructor(...args: unknown[]);
147147
constructor() {
148148
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
149+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
149150
this._signalDisableRipple = !!this._parent && isSignal(this._parent.disableRipple);
150151
}
151152

Diff for: src/material/datepicker/calendar.ts

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {MatYearView} from './year-view';
4040
import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selection-model';
4141
import {MatIconButton, MatButton} from '@angular/material/button';
4242
import {CdkMonitorFocus} from '@angular/cdk/a11y';
43+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
4344

4445
let calendarHeaderId = 1;
4546

@@ -67,6 +68,7 @@ export class MatCalendarHeader<D> {
6768
constructor(...args: unknown[]);
6869

6970
constructor() {
71+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
7072
const changeDetectorRef = inject(ChangeDetectorRef);
7173
this.calendar.stateChanges.subscribe(() => changeDetectorRef.markForCheck());
7274
}

Diff for: src/material/datepicker/datepicker-base.ts

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import {matDatepickerAnimations} from './datepicker-animations';
7474
import {createMissingDateImplError} from './datepicker-errors';
7575
import {DateFilterFn} from './datepicker-input-base';
7676
import {MatDatepickerIntl} from './datepicker-intl';
77+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
7778

7879
/** Used to generate a unique ID for each datepicker instance. */
7980
let datepickerUid = 0;
@@ -201,6 +202,7 @@ export class MatDatepickerContent<S, D = ExtractDateTypeFromSelection<S>>
201202
constructor(...args: unknown[]);
202203

203204
constructor() {
205+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
204206
const intl = inject(MatDatepickerIntl);
205207

206208
this._closeButtonText = intl.closeCalendarLabel;

Diff for: src/material/datepicker/month-view.ts

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import {
5151
MatDateRangeSelectionStrategy,
5252
MAT_DATE_RANGE_SELECTION_STRATEGY,
5353
} from './date-range-selection-strategy';
54+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
5455

5556
const DAYS_PER_WEEK = 7;
5657

@@ -220,6 +221,7 @@ export class MatMonthView<D> implements AfterContentInit, OnChanges, OnDestroy {
220221
constructor(...args: unknown[]);
221222

222223
constructor() {
224+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
223225
if (typeof ngDevMode === 'undefined' || ngDevMode) {
224226
if (!this._dateAdapter) {
225227
throw createMissingDateImplError('DateAdapter');

Diff for: src/material/stepper/step-header.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {CdkStepHeader, StepState} from '@angular/cdk/stepper';
2626
import {_StructuralStylesLoader, MatRipple, ThemePalette} from '@angular/material/core';
2727
import {MatIcon} from '@angular/material/icon';
2828
import {NgTemplateOutlet} from '@angular/common';
29-
import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
29+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
3030

3131
@Component({
3232
selector: 'mat-step-header',
@@ -89,6 +89,7 @@ export class MatStepHeader extends CdkStepHeader implements AfterViewInit, OnDes
8989
super();
9090

9191
inject(_CdkPrivateStyleLoader).load(_StructuralStylesLoader);
92+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
9293
const changeDetectorRef = inject(ChangeDetectorRef);
9394
this._intlSubscription = this._intl.changes.subscribe(() => changeDetectorRef.markForCheck());
9495
}

0 commit comments

Comments
 (0)