Skip to content

Commit 52cad9c

Browse files
authored
docs(cdk/tree): fix several live example issues (angular#29875)
Fixes the following issues with the tree live examples: * Both the tree node and the toggle were marked as toggles which meant that clicking anywhere would close the tree. * The toggles weren't centered relative to the text. * A couple of examples had the same name and one had weird punctuation. Fixes angular#29830.
1 parent fe4271f commit 52cad9c

8 files changed

+43
-21
lines changed

src/components-examples/cdk/tree/cdk-tree-nested-children-accessor/cdk-tree-nested-children-accessor-example.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
.example-tree-node .example-tree-node {
1717
padding-left: 40px;
1818
}
19+
20+
.example-toggle {
21+
vertical-align: middle;
22+
}

src/components-examples/cdk/tree/cdk-tree-nested-children-accessor/cdk-tree-nested-children-accessor-example.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
</cdk-nested-tree-node>
99
<!-- This is the tree node template for expandable nodes -->
1010
<cdk-nested-tree-node #treeNode="cdkNestedTreeNode"
11-
cdkTreeNodeToggle
12-
*cdkTreeNodeDef="let node; when: hasChild"
13-
[cdkTreeNodeTypeaheadLabel]="node.name"
14-
isExpandable
15-
class="example-tree-node">
16-
<button mat-icon-button [attr.aria-label]="'Toggle ' + node.name" cdkTreeNodeToggle>
11+
*cdkTreeNodeDef="let node; when: hasChild"
12+
[cdkTreeNodeTypeaheadLabel]="node.name"
13+
isExpandable
14+
class="example-tree-node">
15+
<button
16+
mat-icon-button
17+
class="example-toggle"
18+
[attr.aria-label]="'Toggle ' + node.name"
19+
cdkTreeNodeToggle>
1720
<mat-icon class="mat-icon-rtl-mirror">
1821
{{tree.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
1922
</mat-icon>

src/components-examples/cdk/tree/cdk-tree-nested-children-accessor/cdk-tree-nested-children-accessor-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function flattenNodes(nodes: NestedFoodNode[]): NestedFoodNode[] {
1717
}
1818

1919
/**
20-
* @title Tree with nested nodes, using childAccessor
20+
* @title Tree with nested nodes using childAccessor
2121
*/
2222
@Component({
2323
selector: 'cdk-tree-nested-children-accessor-example',

src/components-examples/cdk/tree/cdk-tree-nested-level-accessor/cdk-tree-nested-level-accessor-example.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@
1616
.example-tree-node .example-tree-node {
1717
padding-left: 40px;
1818
}
19+
20+
.example-toggle {
21+
vertical-align: middle;
22+
}

src/components-examples/cdk/tree/cdk-tree-nested-level-accessor/cdk-tree-nested-level-accessor-example.html

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
{{node.name}}
88
</cdk-nested-tree-node>
99
<!-- This is the tree node template for expandable nodes -->
10-
<cdk-nested-tree-node #treeNode="cdkNestedTreeNode"
11-
cdkTreeNodeToggle
12-
[cdkTreeNodeTypeaheadLabel]="node.name"
13-
*cdkTreeNodeDef="let node; when: hasChild"
14-
isExpandable
15-
class="example-tree-node">
16-
<button mat-icon-button [attr.aria-label]="'Toggle ' + node.name" cdkTreeNodeToggle>
10+
<cdk-nested-tree-node
11+
#treeNode="cdkNestedTreeNode"
12+
[cdkTreeNodeTypeaheadLabel]="node.name"
13+
*cdkTreeNodeDef="let node; when: hasChild"
14+
isExpandable
15+
class="example-tree-node">
16+
<button
17+
mat-icon-button
18+
class="example-toggle"
19+
[attr.aria-label]="'Toggle ' + node.name"
20+
cdkTreeNodeToggle>
1721
<mat-icon class="mat-icon-rtl-mirror">
1822
{{tree.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
1923
</mat-icon>

src/components-examples/cdk/tree/cdk-tree-nested-level-accessor/cdk-tree-nested-level-accessor-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {MatIconModule} from '@angular/material/icon';
66
import {FLAT_DATA, FlatFoodNode} from '../tree-data';
77

88
/**
9-
* @title Tree with nested nodes
9+
* @title Tree with nested nodes and level accessor
1010
*/
1111
@Component({
1212
selector: 'cdk-tree-nested-level-accessor-example',

src/components-examples/cdk/tree/cdk-tree-nested/cdk-tree-nested-example.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@
1515
.example-tree-node .example-tree-node {
1616
padding-left: 40px;
1717
}
18+
19+
.example-toggle {
20+
vertical-align: middle;
21+
}

src/components-examples/cdk/tree/cdk-tree-nested/cdk-tree-nested-example.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
</cdk-nested-tree-node>
99
<!-- This is the tree node template for expandable nodes -->
1010
<cdk-nested-tree-node #treeNode="cdkNestedTreeNode"
11-
cdkTreeNodeToggle
12-
[cdkTreeNodeTypeaheadLabel]="node.name"
13-
*cdkTreeNodeDef="let node; when: hasChild"
14-
isExpandable
15-
class="example-tree-node">
16-
<button mat-icon-button [attr.aria-label]="'Toggle ' + node.name" cdkTreeNodeToggle>
11+
[cdkTreeNodeTypeaheadLabel]="node.name"
12+
*cdkTreeNodeDef="let node; when: hasChild"
13+
isExpandable
14+
class="example-tree-node">
15+
<button
16+
mat-icon-button
17+
class="example-toggle"
18+
[attr.aria-label]="'Toggle ' + node.name"
19+
cdkTreeNodeToggle>
1720
<mat-icon class="mat-icon-rtl-mirror">
1821
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
1922
</mat-icon>

0 commit comments

Comments
 (0)