Skip to content

Commit 4fe0e3b

Browse files
committed
refactor(multiple): remove visually hidden styles from core
1 parent cd2e4d4 commit 4fe0e3b

File tree

12 files changed

+25
-5
lines changed

12 files changed

+25
-5
lines changed

src/cdk/a11y/BUILD.bazel

Lines changed: 1 addition & 0 deletions
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
],

src/cdk/a11y/aria-describer/aria-describer.ts

Lines changed: 2 additions & 0 deletions
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

src/cdk/a11y/focus-trap/focus-trap.ts

Lines changed: 4 additions & 1 deletion
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.

src/cdk/a11y/live-announcer/live-announcer.ts

Lines changed: 4 additions & 1 deletion
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

@@ -256,7 +257,9 @@ export class CdkAriaLive implements OnDestroy {
256257

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

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

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

src/material/badge/badge.ts

Lines changed: 2 additions & 1 deletion
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

@@ -158,6 +158,7 @@ export class MatBadge implements OnInit, OnDestroy {
158158

159159
constructor() {
160160
inject(_CdkPrivateStyleLoader).load(_MatBadgeStyleLoader);
161+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
161162

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

src/material/chips/chip.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import {Subject, Subscription, merge} from 'rxjs';
4343
import {MatChipAction} from './chip-action';
4444
import {MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
4545
import {MAT_CHIP, MAT_CHIP_AVATAR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON} from './tokens';
46+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
4647

4748
let uid = 0;
4849

@@ -244,6 +245,7 @@ export class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck
244245
constructor(...args: unknown[]);
245246

246247
constructor() {
248+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
247249
const animationMode = inject(ANIMATION_MODULE_TYPE, {optional: true});
248250
this._animationsDisabled = animationMode === 'NoopAnimations';
249251
this._monitorFocus();

src/material/core/_core.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
@use '@angular/cdk';
21
@use './tokens/m2/mat/app' as tokens-mat-app;
32
@use './tokens/token-utils';
43
@use './style/elevation';
54
@use './focus-indicators/private';
65

76
// Mixin that renders all of the core styles that are not theme-dependent.
87
@mixin core() {
9-
@include cdk.a11y-visually-hidden();
108
@include private.structural-styling();
119
}
1210

src/material/core/option/option.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {MAT_OPTGROUP, MatOptgroup} from './optgroup';
3131
import {MatOptionParentComponent, MAT_OPTION_PARENT_COMPONENT} from './option-parent';
3232
import {MatRipple} from '../ripple/ripple';
3333
import {MatPseudoCheckbox} from '../selection/pseudo-checkbox/pseudo-checkbox';
34+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
3435

3536
/**
3637
* Option IDs need to be unique across components, so this counter exists outside of
@@ -144,6 +145,7 @@ export class MatOption<T = any> implements FocusableOption, AfterViewChecked, On
144145

145146
constructor(...args: unknown[]);
146147
constructor() {
148+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
147149
this._signalDisableRipple = !!this._parent && isSignal(this._parent.disableRipple);
148150
}
149151

src/material/datepicker/calendar.ts

Lines changed: 2 additions & 0 deletions
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

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

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

src/material/datepicker/datepicker-base.ts

Lines changed: 2 additions & 0 deletions
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;
@@ -202,6 +203,7 @@ export class MatDatepickerContent<S, D = ExtractDateTypeFromSelection<S>>
202203
constructor(...args: unknown[]);
203204

204205
constructor() {
206+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
205207
const intl = inject(MatDatepickerIntl);
206208

207209
this._closeButtonText = intl.closeCalendarLabel;

src/material/datepicker/month-view.ts

Lines changed: 2 additions & 0 deletions
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

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

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

src/material/stepper/step-header.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {CdkStepHeader, StepState} from '@angular/cdk/stepper';
2626
import {MatRipple, ThemePalette} from '@angular/material/core';
2727
import {MatIcon} from '@angular/material/icon';
2828
import {NgTemplateOutlet} from '@angular/common';
29+
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
2930

3031
@Component({
3132
selector: 'mat-step-header',
@@ -88,6 +89,7 @@ export class MatStepHeader extends CdkStepHeader implements AfterViewInit, OnDes
8889
constructor() {
8990
super();
9091

92+
inject(_CdkPrivateStyleLoader).load(_VisuallyHiddenLoader);
9193
const changeDetectorRef = inject(ChangeDetectorRef);
9294
this._intlSubscription = this._intl.changes.subscribe(() => changeDetectorRef.markForCheck());
9395
}

0 commit comments

Comments
 (0)