File tree Expand file tree Collapse file tree 2 files changed +8
-12
lines changed Expand file tree Collapse file tree 2 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -644,11 +644,9 @@ export class CdkTree<T, K = T>
644
644
this . treeControl . expandAll ( ) ;
645
645
} else if ( this . _expansionModel ) {
646
646
const expansionModel = this . _expansionModel ;
647
- this . _getAllNodes ( )
648
- . pipe ( takeUntil ( this . _onDestroy ) )
649
- . subscribe ( children => {
650
- expansionModel . select ( ...children . map ( child => this . _getExpansionKey ( child ) ) ) ;
651
- } ) ;
647
+ expansionModel . select (
648
+ ...this . _flattenedNodes . value . map ( child => this . _getExpansionKey ( child ) ) ,
649
+ ) ;
652
650
}
653
651
}
654
652
@@ -658,11 +656,9 @@ export class CdkTree<T, K = T>
658
656
this . treeControl . collapseAll ( ) ;
659
657
} else if ( this . _expansionModel ) {
660
658
const expansionModel = this . _expansionModel ;
661
- this . _getAllNodes ( )
662
- . pipe ( takeUntil ( this . _onDestroy ) )
663
- . subscribe ( children => {
664
- expansionModel . deselect ( ...children . map ( child => this . _getExpansionKey ( child ) ) ) ;
665
- } ) ;
659
+ expansionModel . deselect (
660
+ ...this . _flattenedNodes . value . map ( child => this . _getExpansionKey ( child ) ) ,
661
+ ) ;
666
662
}
667
663
}
668
664
Original file line number Diff line number Diff line change @@ -227,7 +227,7 @@ interface ExampleFlatNode {
227
227
{{node.name}}
228
228
</mat-tree-node>
229
229
<!-- This is the tree node template for expandable nodes -->
230
- <mat-tree-node *matTreeNodeDef="let node;when: flatTreeHasChild" matTreeNodePadding>
230
+ <mat-tree-node *matTreeNodeDef="let node;when: flatTreeHasChild" matTreeNodePadding isExpandable >
231
231
<button matTreeNodeToggle>
232
232
Toggle
233
233
</button>
@@ -240,7 +240,7 @@ interface ExampleFlatNode {
240
240
{{node.name}}
241
241
</mat-tree-node>
242
242
<!-- This is the tree node template for expandable nodes -->
243
- <mat-nested-tree-node *matTreeNodeDef="let node; when: nestedTreeHasChild">
243
+ <mat-nested-tree-node *matTreeNodeDef="let node; when: nestedTreeHasChild" isExpandable >
244
244
<button matTreeNodeToggle>
245
245
Toggle
246
246
</button>
You can’t perform that action at this time.
0 commit comments