Skip to content

Commit 9dddb06

Browse files
committed
fix(cdk/tree): cleanup tree-key-manager token
Change how tree-key-manager token is provided. Provide default TreeKeyManager at root. Remove provider from NgModule.
1 parent 93474c7 commit 9dddb06

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,10 @@ export class TreeKeyManager<T extends TreeKeyManagerItem> implements TreeKeyMana
542542
}
543543

544544
/** Injection token that determines the key manager to use. */
545-
export const TREE_KEY_MANAGER = new InjectionToken<TreeKeyManagerFactory<any>>('tree-key-manager');
545+
export const TREE_KEY_MANAGER = new InjectionToken<TreeKeyManagerFactory<any>>('tree-key-manager', {
546+
providedIn: 'root',
547+
factory: TREE_KEY_MANAGER_FACTORY,
548+
});
546549

547550
/** @docs-private */
548551
export function TREE_KEY_MANAGER_FACTORY<T extends TreeKeyManagerItem>(): TreeKeyManagerFactory<T> {

src/cdk/tree/tree-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {TREE_KEY_MANAGER_FACTORY_PROVIDER} from '@angular/cdk/a11y';
109
import {NgModule} from '@angular/core';
1110
import {CdkTreeNodeOutlet} from './outlet';
1211
import {CdkTreeNodePadding} from './padding';
@@ -28,6 +27,5 @@ const EXPORTED_DECLARATIONS = [
2827
@NgModule({
2928
exports: EXPORTED_DECLARATIONS,
3029
declarations: EXPORTED_DECLARATIONS,
31-
providers: [TREE_KEY_MANAGER_FACTORY_PROVIDER],
3230
})
3331
export class CdkTreeModule {}

src/material/tree/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ ng_module(
1818
),
1919
assets = [":tree.css"] + glob(["**/*.html"]),
2020
deps = [
21-
"//src/cdk/a11y",
2221
"//src/cdk/collections",
2322
"//src/cdk/tree",
2423
"//src/material/core",

src/material/tree/tree-module.ts

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

99
import {NgModule} from '@angular/core';
1010

11-
import {TREE_KEY_MANAGER_FACTORY_PROVIDER} from '@angular/cdk/a11y';
1211
import {CdkTreeModule} from '@angular/cdk/tree';
1312
import {MatCommonModule} from '@angular/material/core';
1413
import {MatNestedTreeNode, MatTreeNodeDef, MatTreeNode} from './node';
@@ -31,6 +30,5 @@ const MAT_TREE_DIRECTIVES = [
3130
imports: [CdkTreeModule, MatCommonModule],
3231
exports: [MatCommonModule, MAT_TREE_DIRECTIVES],
3332
declarations: MAT_TREE_DIRECTIVES,
34-
providers: [TREE_KEY_MANAGER_FACTORY_PROVIDER],
3533
})
3634
export class MatTreeModule {}

0 commit comments

Comments
 (0)