Skip to content

Commit ff36c80

Browse files
authoredJul 11, 2024··
fix(material/tree): add levelAccessor, childrenAccessor, TreeKeyManager; a11y and docs improvements (#29062)
Update multiple facets of Tree component. Add APIs to manage data models, improve existing behaviors, add keyboard functionality and update documentation. Add APIs options to the Tree data model by introducing levelAccessor and childrenAccessor. See “Api Addition” for usage. Currently, Tree component use TreeControl to manage data model. When applied, add levelAccessor and childrenAccessor functions as alternatives to TreeControl. Add TreeKeyManager, which provides keyboard functionality. Currently Tree component allows developers to manage focus by setting tabindex on each tree node. When applied, Tree manages its own focus using key manager pattern. Keyboard commands match [WAI ARIA Tree View Pattern](https://www.w3.org/WAI/ARIA/apg/patterns/treeview/). See “Deprecated” for adopting changes to existing applications. Correct the ARIA semantics of Tree and Tree node components. Document updated APIs and behaviors. Refine documentation of existing APIs and behaviors. Changes to Cdk Tree API also apply to Mat Tree API. See “Deprecated” for adopting changes to existing applications. Accessibility: * add CdkTreeKeyManager to provide keyboard navigation for CdkTree and MatTree * Improve keyboard usability of CdkTreeNodeToggle. * Improve ARIA semantics of CdkTree, CdkTreeNode, Tree and TreeNode components * Fix miscellaneous accessibility issues in tree and cdk-tree examples * Add accessibility instructions to documentation Documentation: * Add API and usage examples for TreeKeyManager * Update @angular/cdk/tree and @angular/material/tree to be more consistent * Update examples to use levelAccessor and childrenAccessor * Add example for (activation) on MatTreeNode and CdkTreeNode API ADDITION: add CdkTree#childrenAccessor and CdkTree#levelAccessor * Add CdkTree#childrenAccessor. Given a data node, childrenAccessor determines the children of that node. * Add CdkTree#levelAccessor. Given a data node, levelAccessor determines the level of the node in the parent hierarchy. * CdkTreeNode#levelAcessor and CdkTreeNode#childrenAccessor replace CdkTreeNode#treeControl. See “Deprecated” for updating apps using treeControl. API ADDITION: control expanded state of tree nodes using isExpandable and isExpanded * Add CdkTreeNode#isExpandable, determines if argument tree node can be expanded or collapsed. * CdkTreeNode#isExpanded to specify the expanded state. Has no effect if node is not expandable. * Add NestedTreeControlOptions#isExpandable function, determines if argument tree node can be expanded or collapsed. For trees using treeControl, recommend providing isExpandable if not already provided. See “Deprecated” for more information on updating applications. API ADDITION: use CdkTree to manage expansion state * Add CdkTree#isExpanded method. * Add CdkTree#toggle, CdkTree#expand and CdkTree#collapse methods. * Add CdkTree#toggleDescendants, CdkTree#expandDescendants, and CdkTree#collapseDescendants methods to CdkTree * Add CdkTree#expandAll and CdkTree#collapseAll methods * Add expandedChange Output to CdkTreeNode API ADDITION: add injection token for tree-key-manager * Add TREE_KEY_MANAGER injection token. When provided, tree uses given key manager * TreeKeyManagerStrategy interface, which defines API contract of TREE_KEY_MANAGER API ADDITION: add CdkTreeNode#cdkTreeNodeTypeaheadLabel and CdkTreeNode#getLabel * Add CdkTree#cdkTreeNodeTypeaheadLabel. This is an Input that specifies the label used for typeahead * Add CdkTree#getLabel. Gets the typeahead label for this node. BEHAVIOR CHANGE: MatTree and CdkTree components respond to keyboard navigation. * CdkTree and MatTree respond to arrow keys, page up, page down, etc.; Keyboard commands match [WAI ARIA Tree View Pattern](https://www.w3.org/WAI/ARIA/apg/patterns/treeview/). * Can no longer set the tabindex on MatTreeNode. See “Deprecated” for adopting existing applications. * Add TreeKeyManager to cdk/a11y DEPRECATED: Tree controller deprecated. Use one of levelAccessor or childrenAccessor instead. To be removed in a future version. * BaseTreeControl, TreeControl, FlatTreeControl, and NestedTreeControl deprecated * CdkTree#treeControl deprecated. Provide one of CdkTree#levelAccessor or CdkTree#childrenAccessor instead. * MatTreeFlattener deprecated. Use MatTree#childrenAccessor and MatTreeNode#isExpandable instead. * MatTreeFlatDataSource deprecated. Use one of levelAccessor or childrenAccessor instead of TreeControl. Note when upgrading: isExpandable works differently on Trees using treeControl than trees using childrenAccessor or levelAccessor. Nodes on trees that have a treeControl are expandable by default. Nodes on trees using childrenAccessor or levelAccessor are *not* expandable by default. Provide isExpandable to override default behavior. DEPRECATED: Setting tabindex of tree nodes deprecated. By default, Tree ignores tabindex passed to tree nodes. * MatTreeNode#tabIndex deprecated. MatTreeNode ignores Input tabIndex and manages its own focus behavior. * MatTreeNode#defaultTabIndex deprecated. MatTreeNode ignores defaultTabIndex and manages its own focus behavior. * MatNestedTreeNode#tabIndex deprecated. MatTreeNode ignores Input defaultTabIndex and manages its own focus behavior. * LegacyTreeKeyManager and LEGACY_TREE_KEY_MANAGER_FACTORY_PROVIDER deprecated. Inject a TreeKeyManagerFactory to customize keyboard behavior. Note when upgrading: an opt-out is available for keyboard functionality changes. Provide LEGACY_TREE_KEY_MANAGER_FACTORY_PROVIDER to opt-out of Tree managing its own focus. When provided, Tree does not manage it’s own focus and respects tabindex passed to TreeNode. When provided, have the same focus behavior as before this commit is applied. Add Legacy Keyboard Interface demo, which shows usage of LEGACY_TREE_KEY_MANAGER_FACTORY_PROVIDER. Add Custom Key Manager, which shows usage of injecting a TreeKeyManagerStrategy DEPRECATED: disabled renamed to isDisabled. * CdkTreeNode#disabled deprecated and alias to CdkTreeNode#isDisabled
1 parent b116643 commit ff36c80

File tree

85 files changed

+9196
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+9196
-765
lines changed
 

‎src/cdk/a11y/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ng_module(
1919
deps = [
2020
"//src:dev_mode_types",
2121
"//src/cdk/coercion",
22+
"//src/cdk/coercion/private",
2223
"//src/cdk/keycodes",
2324
"//src/cdk/layout",
2425
"//src/cdk/observers",

‎src/cdk/a11y/a11y.md

+25-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Navigation through options can be made to wrap via the `withWrap` method
2727
this.keyManager = new FocusKeyManager(...).withWrap();
2828
```
2929

30-
#### Types of key managers
30+
#### Types of list key managers
3131

3232
There are two varieties of `ListKeyManager`, `FocusKeyManager` and `ActiveDescendantKeyManager`.
3333

@@ -55,6 +55,30 @@ interface Highlightable extends ListKeyManagerOption {
5555

5656
Each item must also have an ID bound to the listbox's or menu's `aria-activedescendant`.
5757

58+
### TreeKeyManager
59+
60+
`TreeKeyManager` manages the active option in a tree view. Use this key manager for
61+
components that implement a `role="tree"` pattern.
62+
63+
#### Basic usage
64+
65+
Any component that uses a `TreeKeyManager` should do three things:
66+
* Create a `@ViewChildren` query for the tree items being managed.
67+
* Initialize the `TreeKeyManager`, passing in the options.
68+
* Forward keyboard events from the managed component to the `TreeKeyManager` via `onKeydown`.
69+
70+
Each tree item should implement the [`TreeKeyManagerItem`](/cdk/a11y/api#TreeKeyManagerItem) interface.
71+
72+
#### Focus management
73+
74+
The `TreeKeyManager` will handle focusing the appropriate item on keyboard interactions.
75+
76+
`tabindex` should also be set by the component when the active item changes. This can be listened to
77+
via the `change` property on the `TreeKeyManager`. In particular, the tree should only have a
78+
`tabindex` set if there is no active item, and should not have a `tabindex` set if there is an
79+
active item. Only the HTML node corresponding to the active item should have a `tabindex` set to
80+
`0`, with all other items set to `-1`.
81+
5882

5983
### FocusTrap
6084

0 commit comments

Comments
 (0)
Please sign in to comment.