File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed
projects/igniteui-angular/src/lib/grids/columns Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -240,7 +240,7 @@ export class IgxColumnGroupComponent extends IgxColumnComponent implements After
240
240
this . children . forEach ( child => {
241
241
child . parent = this ;
242
242
} ) ;
243
- if ( this . _collapsible && this . checkCollapsibleState ( ) ) {
243
+ if ( this . collapsible ) {
244
244
this . setExpandCollapseState ( ) ;
245
245
}
246
246
}
Original file line number Diff line number Diff line change @@ -1025,10 +1025,7 @@ export class IgxColumnComponent implements AfterContentInit {
1025
1025
set visibleWhenCollapsed ( value : boolean ) {
1026
1026
this . _visibleWhenCollapsed = value ;
1027
1027
this . visibleWhenCollapsedChange . emit ( this . _visibleWhenCollapsed ) ;
1028
- if ( this . parent ) {
1029
- if ( ! this . parent . collapsible ) { this . hidden = this . parent . hidden ; return ; }
1030
- this . hidden = this . parent . expanded ? this . _visibleWhenCollapsed : ! this . _visibleWhenCollapsed ;
1031
- }
1028
+ if ( this . parent ) { this . parent . setExpandCollapseState ( ) ; }
1032
1029
if ( this . grid ) {
1033
1030
this . grid . notifyChanges ( true ) ;
1034
1031
}
@@ -1768,6 +1765,7 @@ export class IgxColumnComponent implements AfterContentInit {
1768
1765
*/
1769
1766
protected setExpandCollapseState ( ) {
1770
1767
this . children . filter ( col => ( col . visibleWhenCollapsed !== undefined ) ) . forEach ( c => {
1768
+ if ( ! this . collapsible ) { c . hidden = this . parent . hidden ; return ; }
1771
1769
c . hidden = this . _expanded ? c . visibleWhenCollapsed : ! c . visibleWhenCollapsed ;
1772
1770
} ) ;
1773
1771
}
You can’t perform that action at this time.
0 commit comments