Skip to content

Commit 4c71677

Browse files
authored
Merge pull request #7244 from IgniteUI/mkirova/pinned-chip-refactor
fix(igxGrid): Refactor displayPinnedChip to be an Input set by the ro…
2 parents 19e759f + bdd0ee5 commit 4c71677

File tree

5 files changed

+38
-13
lines changed

5 files changed

+38
-13
lines changed

projects/igniteui-angular/src/lib/grids/cell.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,10 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
526526
/**
527527
* @hidden
528528
*/
529+
@Input()
529530
@HostBinding('class.igx-grid__td--row-pinned-first')
530-
public get displayPinnedChip() {
531-
return this.row.pinned && this.row.disabled && this.visibleColumnIndex === 0;
532-
}
531+
public displayPinnedChip = false;
532+
533533

534534
@ViewChild('defaultCell', { read: TemplateRef, static: true })
535535
protected defaultCellTemplate: TemplateRef<any>;

projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@
110110
[cellTemplate]="col.bodyTemplate"
111111
[lastSearchInfo]="grid.lastSearchInfo"
112112
[active]="isCellActive(col.visibleIndex)"
113-
[cellSelectionMode]="grid.cellSelection" #cell>
113+
[cellSelectionMode]="grid.cellSelection"
114+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
115+
#cell>
114116
</igx-grid-cell>
115117
</ng-template>
116118

@@ -138,7 +140,9 @@
138140
[cellTemplate]="col.bodyTemplate"
139141
[lastSearchInfo]="grid.lastSearchInfo"
140142
[active]="isCellActive(col.visibleIndex)"
141-
[cellSelectionMode]="grid.cellSelection" #cell>
143+
[cellSelectionMode]="grid.cellSelection"
144+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
145+
#cell>
142146
</igx-expandable-grid-cell>
143147
</ng-template>
144148

@@ -170,7 +174,9 @@
170174
[cellTemplate]="col.bodyTemplate"
171175
[lastSearchInfo]="grid.lastSearchInfo"
172176
[active]="isCellActive(col.visibleIndex)"
173-
[cellSelectionMode]="grid.cellSelection" #cell>
177+
[cellSelectionMode]="grid.cellSelection"
178+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
179+
#cell>
174180
</igx-grid-cell>
175181
</ng-template>
176182

@@ -202,6 +208,8 @@
202208
[cellTemplate]="col.bodyTemplate"
203209
[lastSearchInfo]="grid.lastSearchInfo"
204210
[active]="isCellActive(col.visibleIndex)"
205-
[cellSelectionMode]="grid.cellSelection" #cell>
211+
[cellSelectionMode]="grid.cellSelection"
212+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
213+
#cell>
206214
</igx-expandable-grid-cell>
207215
</ng-template>

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
[value]="rowData[col.field]"
5959
[cellTemplate]="col.bodyTemplate"
6060
[lastSearchInfo]="grid.lastSearchInfo"
61-
[cellSelectionMode]="grid.cellSelection">
61+
[cellSelectionMode]="grid.cellSelection"
62+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)">
6263
</igx-hierarchical-grid-cell>
6364
</ng-template>
6465

@@ -104,6 +105,7 @@
104105
[value]="rowData[col.field]"
105106
[cellTemplate]="col.bodyTemplate"
106107
[lastSearchInfo]="grid.lastSearchInfo"
107-
[cellSelectionMode]="grid.cellSelection">
108+
[cellSelectionMode]="grid.cellSelection"
109+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)">
108110
</igx-hierarchical-grid-cell>
109111
</ng-template>

projects/igniteui-angular/src/lib/grids/row.directive.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,13 @@ export class IgxRowDirective<T extends IgxGridBaseDirective & GridType> implemen
434434
this.cdr.markForCheck();
435435
}
436436

437+
/**
438+
* @hidden
439+
*/
440+
public shouldDisplayPinnedChip(visibleColumnIndex: number): boolean {
441+
return this.pinned && this.disabled && visibleColumnIndex === 0;
442+
}
443+
437444
/**
438445
* @hidden
439446
*/

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
[cellTemplate]="col.bodyTemplate"
3737
[lastSearchInfo]="grid.lastSearchInfo"
3838
[active]="isCellActive(col.visibleIndex)"
39-
[cellSelectionMode]="grid.cellSelection" #treeCell>
39+
[cellSelectionMode]="grid.cellSelection"
40+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
41+
#treeCell>
4042
</igx-grid-cell>
4143
</ng-template>
4244
<ng-template #treeCellTemplate>
@@ -64,7 +66,9 @@
6466
[cellTemplate]="col.bodyTemplate"
6567
[lastSearchInfo]="grid.lastSearchInfo"
6668
[active]="isCellActive(col.visibleIndex)"
67-
[cellSelectionMode]="grid.cellSelection" #treeCell>
69+
[cellSelectionMode]="grid.cellSelection"
70+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
71+
#treeCell>
6872
</igx-tree-grid-cell>
6973
</ng-template>
7074
<ng-container *ngTemplateOutlet="col.visibleIndex === 0 ? treeCellTemplate : cellTemplate"></ng-container>
@@ -112,7 +116,9 @@
112116
[cellTemplate]="col.bodyTemplate"
113117
[lastSearchInfo]="grid.lastSearchInfo"
114118
[active]="isCellActive(col.visibleIndex)"
115-
[cellSelectionMode]="grid.cellSelection" #treeCell>
119+
[cellSelectionMode]="grid.cellSelection"
120+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
121+
#treeCell>
116122
</igx-grid-cell>
117123
</ng-template>
118124
<ng-template #treeCellTemplate>
@@ -142,7 +148,9 @@
142148
[cellTemplate]="col.bodyTemplate"
143149
[lastSearchInfo]="grid.lastSearchInfo"
144150
[active]="isCellActive(col.visibleIndex)"
145-
[cellSelectionMode]="grid.cellSelection" #treeCell>
151+
[cellSelectionMode]="grid.cellSelection"
152+
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
153+
#treeCell>
146154
</igx-tree-grid-cell>
147155
</ng-template>
148156
<ng-container *ngTemplateOutlet="col.visibleIndex === 0 ? treeCellTemplate : cellTemplate"></ng-container>

0 commit comments

Comments
 (0)