Skip to content

Commit c955ffb

Browse files
committed
fix(cdk/tree): address review comments
1 parent 1309d3b commit c955ffb

File tree

7 files changed

+13
-177
lines changed

7 files changed

+13
-177
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
display: flex;
33
align-items: center;
44
}
5+
6+
.example-tree-node:not(.example-expandable) {
7+
line-height: 40px;
8+
padding-left: 40px;
9+
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<cdk-tree [dataSource]="dataSource" [levelAccessor]="levelAccessor">
22
<!-- This is the tree node template for leaf nodes -->
33
<cdk-nested-tree-node *cdkTreeNodeDef="let node" class="example-tree-node">
4-
<!-- use a disabled button to provide padding for tree leaf -->
5-
<button mat-icon-button disabled></button>
64
{{node.name}}
75
</cdk-nested-tree-node>
86
<!-- This is the tree node template for expandable nodes -->
97
<cdk-nested-tree-node *cdkTreeNodeDef="let node; when: hasChild"
108
[isExpandable]="node.expandable"
11-
class="example-tree-node">
9+
[style.display]="shouldRender(node) ? 'flex' : 'none'"
10+
class="example-tree-node example-expandable">
1211
<button mat-icon-button cdkTreeNodeToggle
1312
[attr.aria-label]="'Toggle ' + node.name"
1413
(click)="node.isExpanded = !node.isExpanded"

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export class CdkTreeNestedLevelAccessorExample {
2020
getParentNode(node: FlatFoodNode) {
2121
const nodeIndex = FLAT_DATA.indexOf(node);
2222

23+
// Determine the node's parent by finding the first preceding node that's
24+
// one level shallower.
2325
for (let i = nodeIndex - 1; i >= 0; i--) {
2426
if (FLAT_DATA[i].level === node.level - 1) {
2527
return FLAT_DATA[i];
@@ -29,14 +31,9 @@ export class CdkTreeNestedLevelAccessorExample {
2931
return null;
3032
}
3133

32-
shouldRender(node: FlatFoodNode) {
33-
let parent = this.getParentNode(node);
34-
while (parent) {
35-
if (!parent.isExpanded) {
36-
return false;
37-
}
38-
parent = this.getParentNode(parent);
39-
}
40-
return true;
34+
shouldRender(node: FlatFoodNode): boolean {
35+
// This node should render if it is a root node or if all of its ancestors are expanded.
36+
const parent = this.getParentNode(node);
37+
return !parent || (!!parent.isExpanded && this.shouldRender(parent));
4138
}
4239
}

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

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/components-examples/cdk/tree/cdk-tree-redesign/tree-data.ts

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)