Skip to content

Commit 44ab699

Browse files
committed
Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mkirova/pivot-dropArea-additionalUI
2 parents af945f8 + e21f61b commit 44ab699

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-navigation.service.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,12 @@ export class IgxPivotGridNavigationService extends IgxGridNavigationService {
5050
super.handleNavigation(event);
5151
}
5252
}
53+
54+
public focusTbody(event) {
55+
if (!this.activeNode || this.activeNode.row === null || this.activeNode.row === undefined) {
56+
this.activeNode = this.lastActiveNode;
57+
} else {
58+
super.focusTbody(event);
59+
}
60+
}
5361
}

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export class IgxPivotRowExpansionPipe implements PipeTransform {
8585
data.forEach(rec => {
8686
const keys = Object.keys(rec);
8787
delete rec.processed;
88+
delete rec.sorted;
8889
//remove all record keys from final data since we don't need them anymore.
8990
keys.forEach(k => {
9091
if (k.indexOf(pivotKeys.records) !== -1) {

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export class PivotUtil {
4747
rec[k] = this.sort(unsorted, expressions, sorting, pivotKeys);
4848
}
4949
});
50-
delete rec.sorted;
5150
});
5251
return DataUtil.sort(data, expressions, sorting);
5352
}

0 commit comments

Comments
 (0)