File tree Expand file tree Collapse file tree 2 files changed +18
-14
lines changed
projects/igniteui-angular/src/lib/grids/columns Expand file tree Collapse file tree 2 files changed +18
-14
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ export class IgxColumnGroupComponent extends IgxColumnComponent implements After
48
48
}
49
49
}
50
50
public get collapsible ( ) {
51
- return this . _collapsible ;
51
+ return this . _collapsible && this . checkCollapsibleState ( ) ;
52
52
}
53
53
54
54
/**
@@ -240,15 +240,11 @@ export class IgxColumnGroupComponent extends IgxColumnComponent implements After
240
240
this . children . forEach ( child => {
241
241
child . parent = this ;
242
242
} ) ;
243
- if ( this . collapsible ) {
244
- const cols = this . children . map ( child => child . visibleWhenCollapsed ) ;
245
- if ( ! ( cols . some ( c => c === true ) && cols . some ( c => c === false ) ) ) {
246
- this . collapsible = false ;
247
- return ;
248
- }
243
+ if ( this . _collapsible && this . checkCollapsibleState ( ) ) {
249
244
this . setExpandCollapseState ( ) ;
250
245
}
251
246
}
247
+
252
248
/**
253
249
* Returns the children columns collection.
254
250
* ```typescript
Original file line number Diff line number Diff line change @@ -1026,17 +1026,16 @@ export class IgxColumnComponent implements AfterContentInit {
1026
1026
this . _visibleWhenCollapsed = value ;
1027
1027
this . visibleWhenCollapsedChange . emit ( this . _visibleWhenCollapsed ) ;
1028
1028
if ( this . parent ) {
1029
- const cols = this . parent . children . map ( child => child . visibleWhenCollapsed ) ;
1030
- if ( ! ( cols . some ( c => c === true ) && cols . some ( c => c === false ) ) ) {
1031
- this . parent . collapsible = false ;
1032
- } else {
1033
- this . parent . collapsible = true ;
1034
- }
1029
+ if ( ! this . parent . collapsible ) { this . hidden = this . parent . hidden ; return ; }
1030
+ this . hidden = this . parent . expanded ? this . _visibleWhenCollapsed : ! this . _visibleWhenCollapsed ;
1035
1031
}
1032
+ if ( this . grid ) {
1033
+ this . grid . notifyChanges ( true ) ;
1034
+ }
1035
+
1036
1036
}
1037
1037
1038
1038
get visibleWhenCollapsed ( ) : boolean {
1039
- if ( ! this . parent ) { return ; }
1040
1039
return this . _visibleWhenCollapsed ;
1041
1040
}
1042
1041
@@ -1772,6 +1771,15 @@ export class IgxColumnComponent implements AfterContentInit {
1772
1771
c . hidden = this . _expanded ? c . visibleWhenCollapsed : ! c . visibleWhenCollapsed ;
1773
1772
} ) ;
1774
1773
}
1774
+ /**
1775
+ * @hidden
1776
+ * @internal
1777
+ */
1778
+ protected checkCollapsibleState ( ) {
1779
+ if ( ! this . children ) { return false ; }
1780
+ const cols = this . children . map ( child => child . visibleWhenCollapsed ) ;
1781
+ return ( cols . some ( c => c === true ) && cols . some ( c => c === false ) ) ;
1782
+ }
1775
1783
1776
1784
/**
1777
1785
*@hidden
You can’t perform that action at this time.
0 commit comments