Skip to content

Commit 62804fb

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Update header templates.
1 parent d300ee5 commit 62804fb

File tree

6 files changed

+23
-15
lines changed

6 files changed

+23
-15
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
[hasMRL]="hasColumnLayouts"
2020
[activeDescendant]="activeDescendant"
2121
[width]="calcWidth"
22-
[pinnedColumnCollection]="pinnedColumns"
22+
[pinnedStartColumnCollection]="pinnedStartColumns"
23+
[pinnedEndColumnCollection]="pinnedEndColumns"
2324
[unpinnedColumnCollection]="unpinnedColumns"
2425
(keydown.meta.c)="copyHandler($event)"
2526
(keydown.control.c)="copyHandler($event)"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<div class="igx-grid__tr" role="row" [style.width.px]="width">
66

77
<!-- Left column moving area -->
8-
@if (grid.moving && grid.columnInDrag && pinnedColumnCollection.length <= 0) {
8+
@if (grid.moving && grid.columnInDrag && pinnedStartColumnCollection.length <= 0) {
99
<span id="left" class="igx-grid__scroll-on-drag-left" droppable="true" [style.left.px]="grid.pinnedStartWidth"
1010
[igxColumnMovingDrop]="headerContainer"></span>
1111
}
12-
@if (grid.moving && grid.columnInDrag && pinnedColumnCollection.length > 0) {
12+
@if (grid.moving && grid.columnInDrag && pinnedStartColumnCollection.length > 0) {
1313
<span id="left" class="igx-grid__scroll-on-drag-pinned" droppable="true" [style.left.px]="grid.pinnedStartWidth"
1414
[igxColumnMovingDrop]="headerContainer"></span>
1515
}
@@ -61,8 +61,8 @@
6161
}
6262

6363
<!-- Pinned columns collection from the start -->
64-
@if (pinnedColumnCollection.length && grid.isPinningToStart) {
65-
@for (column of pinnedColumnCollection | igxTopLevel; track trackPinnedColumn(column)) {
64+
@if (pinnedStartColumnCollection.length) {
65+
@for (column of pinnedStartColumnCollection | igxTopLevel; track trackPinnedColumn(column)) {
6666
<igx-grid-header-group
6767
[ngClass]="column.headerGroupClasses"
6868
[ngStyle]="column.headerGroupStyles | igxHeaderGroupStyle:column:grid.pipeTrigger"
@@ -92,8 +92,8 @@
9292
</ng-template>
9393

9494
<!-- Pinned columns collection at the end -->
95-
@if (pinnedColumnCollection.length && !grid.isPinningToStart) {
96-
@for (column of pinnedColumnCollection | igxTopLevel; track trackPinnedColumn(column)) {
95+
@if (pinnedEndColumnCollection.length) {
96+
@for (column of pinnedEndColumnCollection | igxTopLevel; track trackPinnedColumn(column)) {
9797
<igx-grid-header-group
9898
[ngClass]="column.headerGroupClasses"
9999
[ngStyle]="column.headerGroupStyles |igxHeaderGroupStyle:column:grid.pipeTrigger"

projects/igniteui-angular/src/lib/grids/headers/grid-header-row.component.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,14 @@ export class IgxGridHeaderRowComponent implements DoCheck {
4444
@Input()
4545
public grid: GridType;
4646

47-
/** Pinned columns of the grid. */
47+
/** Pinned columns of the grid at start. */
4848
@Input()
49-
public pinnedColumnCollection: ColumnType[] = [];
49+
public pinnedStartColumnCollection: ColumnType[] = [];
50+
51+
/** Pinned columns of the grid at end. */
52+
@Input()
53+
public pinnedEndColumnCollection: ColumnType[] = [];
54+
5055

5156
/** Unpinned columns of the grid. */
5257
@Input()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
[hasMRL]="hasColumnLayouts"
77
[activeDescendant]="activeDescendant"
88
[width]="calcWidth"
9-
[pinnedColumnCollection]="pinnedColumns"
9+
[pinnedStartColumnCollection]="pinnedStartColumns"
10+
[pinnedEndColumnCollection]="pinnedEndColumns"
1011
[unpinnedColumnCollection]="unpinnedColumns"
1112
(keydown.meta.c)="copyHandler($event)"
1213
(keydown.control.c)="copyHandler($event)"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
}
268268

269269
<!-- Pinned columns collection from the start -->
270-
@if (pinnedColumnCollection.length && grid.isPinningToStart) {
271-
@for (column of pinnedColumnCollection | igxTopLevel; track column) {
270+
@if (pinnedStartColumnCollection.length) {
271+
@for (column of pinnedStartColumnCollection | igxTopLevel; track column) {
272272
<igx-grid-header-group [ngClass]="column.headerGroupClasses"
273273
[ngStyle]="column.headerGroupStyles | igxHeaderGroupStyle:column:grid.pipeTrigger" [column]="column"
274274
[style.min-width]="column.resolvedWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
@@ -299,8 +299,8 @@
299299
</div>
300300

301301
<!-- Pinned columns collection at the end -->
302-
@if (pinnedColumnCollection.length && !grid.isPinningToStart) {
303-
@for (column of pinnedColumnCollection | igxTopLevel; track column) {
302+
@if (pinnedEndColumnCollection.length) {
303+
@for (column of pinnedEndColumnCollection | igxTopLevel; track column) {
304304
<igx-grid-header-group [ngClass]="column.headerGroupClasses"
305305
[ngStyle]="column.headerGroupStyles |igxHeaderGroupStyle:column:grid.pipeTrigger" [column]="column"
306306
[style.min-width]="column.resolvedWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
[hasMRL]="hasColumnLayouts"
66
[activeDescendant]="activeDescendant"
77
[width]="calcWidth"
8-
[pinnedColumnCollection]="pinnedColumns"
8+
[pinnedStartColumnCollection]="pinnedStartColumns"
9+
[pinnedEndColumnCollection]="pinnedEndColumns"
910
[unpinnedColumnCollection]="unpinnedColumns"
1011
(keydown.meta.c)="copyHandler($event)"
1112
(keydown.control.c)="copyHandler($event)"

0 commit comments

Comments
 (0)