Skip to content

Commit 30f6c3c

Browse files
committed
fix(cdk/a11y): remove deprecated factory functions
Removes factory functions that we had marked as deprecated for v21. These functions aren't necessary since we switched to standalone. BREAKING CHANGE: * `LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY` has been removed. * `TREE_KEY_MANAGER_FACTORY` has been removed. * `TREE_KEY_MANAGER_FACTORY_PROVIDER` has been removed.
1 parent 17cc760 commit 30f6c3c

File tree

4 files changed

+4
-72
lines changed

4 files changed

+4
-72
lines changed

goldens/cdk/a11y/index.api.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,6 @@ export const LIVE_ANNOUNCER_DEFAULT_OPTIONS: InjectionToken<LiveAnnouncerDefault
401401
// @public (undocumented)
402402
export const LIVE_ANNOUNCER_ELEMENT_TOKEN: InjectionToken<HTMLElement | null>;
403403

404-
// @public @deprecated
405-
export function LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY(): null;
406-
407404
// @public (undocumented)
408405
export class LiveAnnouncer implements OnDestroy {
409406
constructor(...args: unknown[]);
@@ -429,9 +426,6 @@ export interface LiveAnnouncerDefaultOptions {
429426
// @public @deprecated
430427
export const MESSAGES_CONTAINER_ID = "cdk-describedby-message-container";
431428

432-
// @public @deprecated
433-
export function NOOP_TREE_KEY_MANAGER_FACTORY<T extends TreeKeyManagerItem>(): TreeKeyManagerFactory<T>;
434-
435429
// @public @deprecated
436430
export const NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER: Provider;
437431

@@ -465,15 +459,6 @@ export function removeAriaReferencedId(el: Element, attr: `aria-${string}`, id:
465459
// @public
466460
export const TREE_KEY_MANAGER: InjectionToken<TreeKeyManagerFactory<any>>;
467461

468-
// @public @deprecated
469-
export function TREE_KEY_MANAGER_FACTORY<T extends TreeKeyManagerItem>(): TreeKeyManagerFactory<T>;
470-
471-
// @public @deprecated
472-
export const TREE_KEY_MANAGER_FACTORY_PROVIDER: {
473-
provide: InjectionToken<TreeKeyManagerFactory<any>>;
474-
useFactory: typeof TREE_KEY_MANAGER_FACTORY;
475-
};
476-
477462
// @public
478463
export class TreeKeyManager<T extends TreeKeyManagerItem> implements TreeKeyManagerStrategy<T> {
479464
constructor(items: Observable<T[]> | QueryList<T> | T[], config: TreeKeyManagerOptions<T>);

src/cdk/a11y/key-manager/noop-tree-key-manager.ts

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88

99
import {Subject} from 'rxjs';
1010
import {TREE_KEY_MANAGER} from './tree-key-manager';
11-
import {
12-
TreeKeyManagerFactory,
13-
TreeKeyManagerItem,
14-
TreeKeyManagerStrategy,
15-
} from './tree-key-manager-strategy';
11+
import {TreeKeyManagerItem, TreeKeyManagerStrategy} from './tree-key-manager-strategy';
1612
import {Provider} from '@angular/core';
1713

1814
// NoopTreeKeyManager is a "noop" implementation of TreeKeyMangerStrategy. Methods are noops. Does
@@ -67,27 +63,6 @@ export class NoopTreeKeyManager<T extends TreeKeyManagerItem> implements TreeKey
6763
}
6864
}
6965

70-
/**
71-
* @docs-private
72-
*
73-
* Opt-out of Tree of key manager behavior.
74-
*
75-
* When provided, Tree has same focus management behavior as before TreeKeyManager was introduced.
76-
* - Tree does not respond to keyboard interaction
77-
* - Tree node allows tabindex to be set by Input binding
78-
* - Tree node allows tabindex to be set by attribute binding
79-
*
80-
* @deprecated NoopTreeKeyManager deprecated. Use TreeKeyManager or inject a
81-
* TreeKeyManagerStrategy instead. To be removed in a future version.
82-
*
83-
* @breaking-change 21.0.0
84-
*/
85-
export function NOOP_TREE_KEY_MANAGER_FACTORY<
86-
T extends TreeKeyManagerItem,
87-
>(): TreeKeyManagerFactory<T> {
88-
return () => new NoopTreeKeyManager<T>();
89-
}
90-
9166
/**
9267
* @docs-private
9368
*
@@ -105,5 +80,5 @@ export function NOOP_TREE_KEY_MANAGER_FACTORY<
10580
*/
10681
export const NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER: Provider = {
10782
provide: TREE_KEY_MANAGER,
108-
useFactory: NOOP_TREE_KEY_MANAGER_FACTORY,
83+
useFactory: () => () => new NoopTreeKeyManager(),
10984
};

src/cdk/a11y/key-manager/tree-key-manager.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -411,27 +411,8 @@ export class TreeKeyManager<T extends TreeKeyManagerItem> implements TreeKeyMana
411411
}
412412
}
413413

414-
/**
415-
* @docs-private
416-
* @deprecated No longer used, will be removed.
417-
* @breaking-change 21.0.0
418-
*/
419-
export function TREE_KEY_MANAGER_FACTORY<T extends TreeKeyManagerItem>(): TreeKeyManagerFactory<T> {
420-
return (items, options) => new TreeKeyManager(items, options);
421-
}
422-
423414
/** Injection token that determines the key manager to use. */
424415
export const TREE_KEY_MANAGER = new InjectionToken<TreeKeyManagerFactory<any>>('tree-key-manager', {
425416
providedIn: 'root',
426-
factory: TREE_KEY_MANAGER_FACTORY,
417+
factory: () => (items, options) => new TreeKeyManager(items, options),
427418
});
428-
429-
/**
430-
* @docs-private
431-
* @deprecated No longer used, will be removed.
432-
* @breaking-change 21.0.0
433-
*/
434-
export const TREE_KEY_MANAGER_FACTORY_PROVIDER = {
435-
provide: TREE_KEY_MANAGER,
436-
useFactory: TREE_KEY_MANAGER_FACTORY,
437-
};

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,10 @@ export const LIVE_ANNOUNCER_ELEMENT_TOKEN = new InjectionToken<HTMLElement | nul
1818
'liveAnnouncerElement',
1919
{
2020
providedIn: 'root',
21-
factory: LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY,
21+
factory: () => null,
2222
},
2323
);
2424

25-
/**
26-
* @docs-private
27-
* @deprecated No longer used, will be removed.
28-
* @breaking-change 21.0.0
29-
*/
30-
export function LIVE_ANNOUNCER_ELEMENT_TOKEN_FACTORY(): null {
31-
return null;
32-
}
33-
3425
/** Object that can be used to configure the default options for the LiveAnnouncer. */
3526
export interface LiveAnnouncerDefaultOptions {
3627
/** Default politeness for the announcements. */

0 commit comments

Comments
 (0)