Skip to content

Commit 659b8b5

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix a different way - use _filteredUnpinnedData in case there are pinned rows.
1 parent 4bcde9d commit 659b8b5

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

projects/igniteui-angular/src/lib/grids/api.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
3333

3434
public get_summary_data() {
3535
const grid = this.grid;
36-
let data = grid.unpinnedRecords;
36+
let data = grid.filteredData;
37+
if (data && grid.hasPinnedRecords) {
38+
data = grid._filteredUnpinnedData;
39+
}
3740
if (!data) {
3841
if (grid.transactions.enabled) {
3942
data = DataUtil.mergeTransactions(

projects/igniteui-angular/src/lib/grids/common/pipes.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ export class IgxGridRowPinningPipe implements PipeTransform {
226226

227227
public transform(collection: any[] , id: string, isPinned = false, pipeTrigger: number) {
228228
const grid = this.gridAPI.grid;
229+
230+
if (!grid.hasPinnedRecords) {
231+
return isPinned ? [] : collection;
232+
}
233+
229234
if (grid.hasPinnedRecords && isPinned) {
230235
const result = collection.filter(rec => grid.isRecordPinned(rec));
231236
result.sort((rec1, rec2) => grid.pinRecordIndex(rec1) - grid.pinRecordIndex(rec2));
@@ -234,9 +239,6 @@ export class IgxGridRowPinningPipe implements PipeTransform {
234239

235240
grid.unpinnedRecords = collection;
236241

237-
if (!grid.hasPinnedRecords) {
238-
return isPinned ? [] : collection;
239-
}
240242
return collection.map((rec) => {
241243
return grid.isRecordPinned(rec) ? { recordRef: rec, ghostRecord: true} : rec;
242244
});

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2457,7 +2457,11 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
24572457
protected _filteredSortedPinnedData;
24582458
protected _filteredSortedUnpinnedData;
24592459
protected _filteredPinnedData;
2460-
protected _filteredUnpinnedData;
2460+
2461+
/**
2462+
* @hidden
2463+
*/
2464+
public _filteredUnpinnedData;
24612465

24622466
/**
24632467
* @hidden

0 commit comments

Comments
 (0)