@@ -75,28 +75,14 @@ export class IgxPivotGridNavigationService extends IgxGridNavigationService {
75
75
public override handleAlt ( key : string , event : KeyboardEvent ) : void {
76
76
event . preventDefault ( ) ;
77
77
78
- let row = this . grid . gridAPI . get_row_by_index ( this . activeNode . row ) ;
79
- let expansionRowKey = PivotUtil . getRecordKey ( row . data , row . data . dimensions [ 0 ] )
80
- let isExpanded = this . grid . expansionStates . has ( expansionRowKey ) ? this . grid . expansionStates . get ( expansionRowKey ) : true ;
78
+ const row = this . grid . gridAPI . get_row_by_index ( this . activeNode . row ) ;
79
+ const expansionRowKey = PivotUtil . getRecordKey ( row . data , row . data . dimensions [ this . activeNode . column ] )
80
+ const isExpanded = this . grid . expansionStates . get ( expansionRowKey ) ?? true ;
81
81
82
- if ( ! isExpanded && ROW_EXPAND_KEYS . has ( key ) ) {
83
- if ( row . key === undefined ) {
84
- // TODO use expanded row.expanded = !row.expanded;
85
- ( row as any ) . toggle ( ) ;
86
- } else {
87
- const newExpansionState = new Map < any , boolean > ( this . grid . expansionStates ) ;
88
- newExpansionState . set ( expansionRowKey , true ) ;
89
- this . grid . expansionStates = newExpansionState ;
90
- }
91
- } else if ( isExpanded && ROW_COLLAPSE_KEYS . has ( key ) ) {
92
- if ( row . key === undefined ) {
93
- // TODO use expanded row.expanded = !row.expanded;
94
- ( row as any ) . toggle ( ) ;
95
- } else {
96
- const newExpansionState = new Map < any , boolean > ( this . grid . expansionStates ) ;
97
- newExpansionState . set ( expansionRowKey , false ) ;
98
- this . grid . expansionStates = newExpansionState ;
99
- }
82
+ if ( ROW_EXPAND_KEYS . has ( key ) && ! isExpanded ) {
83
+ this . grid . gridAPI . set_row_expansion_state ( expansionRowKey , true , event )
84
+ } else if ( ROW_COLLAPSE_KEYS . has ( key ) && isExpanded ) {
85
+ this . grid . gridAPI . set_row_expansion_state ( expansionRowKey , false , event )
100
86
}
101
87
this . grid . notifyChanges ( ) ;
102
88
}
0 commit comments