Skip to content

Commit e84e0d0

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Remove and update all old checks for root grid pin direction.
1 parent b0de0c0 commit e84e0d0

File tree

11 files changed

+40
-34
lines changed

11 files changed

+40
-34
lines changed

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
15071507
return this._vIndex;
15081508
}
15091509
const unpinnedColumns = this.grid.unpinnedColumns.filter(c => !c.columnGroup);
1510-
const pinnedColumns = this.grid.pinnedColumns.filter(c => !c.columnGroup);
1510+
const pinnedStartColumns = this.grid.pinnedStartColumns.filter(c => !c.columnGroup);
1511+
const pinnedEndColumns = this.grid.pinnedEndColumns.filter(c => !c.columnGroup);
15111512

15121513
let col = this;
15131514
let vIndex = -1;
@@ -1522,15 +1523,13 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
15221523
if (!this.pinned) {
15231524
const indexInCollection = unpinnedColumns.indexOf(col);
15241525
vIndex = indexInCollection === -1 ?
1525-
-1 :
1526-
(this.grid.isPinningToStart ?
1527-
pinnedColumns.length + indexInCollection :
1528-
indexInCollection);
1526+
-1 : pinnedStartColumns.length + indexInCollection;
15291527
} else {
1530-
const indexInCollection = pinnedColumns.indexOf(col);
1531-
vIndex = this.grid.isPinningToStart ?
1528+
const indexInCollection = this.pinningPosition === ColumnPinningPosition.Start ?
1529+
pinnedStartColumns.indexOf(col) : pinnedEndColumns.indexOf(col);
1530+
vIndex = this.pinningPosition === ColumnPinningPosition.Start ?
15321531
indexInCollection :
1533-
unpinnedColumns.length + indexInCollection;
1532+
pinnedStartColumns.length + unpinnedColumns.length + indexInCollection;
15341533
}
15351534
this._vIndex = vIndex;
15361535
return vIndex;

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,6 @@ export interface GridType extends IGridDataBindable {
776776
isRowSelectable: boolean;
777777
/** Indicates whether the selectors of the rows are visible */
778778
showRowSelectors: boolean;
779-
/** Indicates whether the grid's element is pinned to the start of the grid */
780-
isPinningToStart: boolean;
781779
/** Indicates if the column of the grid is in drag mode */
782780
columnInDrag: any;
783781
/** @hidden @internal */

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-moving.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { BaseFilteringComponent } from './base-filtering.component';
44
import { IgxIconComponent } from '../../../icon/icon.component';
55
import { IgxButtonDirective } from '../../../directives/button/button.directive';
66
import { IgxButtonGroupComponent } from '../../../buttonGroup/buttonGroup.component';
7+
import { ColumnPinningPosition } from '../../common/enums';
78

89
/**
910
* A component used for presenting Excel style column moving UI.
@@ -49,24 +50,24 @@ export class IgxExcelStyleMovingComponent {
4950
public onMoveButtonClicked(moveDirection) {
5051
let targetColumn;
5152
if (this.esf.column.pinned) {
52-
if (this.esf.column.isLastPinned && moveDirection === 1 && this.esf.grid.isPinningToStart) {
53+
if (this.esf.column.isLastPinned && moveDirection === 1 && this.esf.column.pinningPosition === ColumnPinningPosition.Start) {
5354
targetColumn = this.esf.grid.unpinnedColumns[0];
5455
moveDirection = 0;
55-
} else if (this.esf.column.isFirstPinned && moveDirection === 0 && !this.esf.grid.isPinningToStart) {
56+
} else if (this.esf.column.isFirstPinned && moveDirection === 0 && this.esf.column.pinningPosition === ColumnPinningPosition.End) {
5657
targetColumn = this.esf.grid.unpinnedColumns[this.esf.grid.unpinnedColumns.length - 1];
5758
moveDirection = 1;
5859
} else {
5960
targetColumn = this.findColumn(moveDirection, this.esf.grid.pinnedColumns);
6061
}
6162
} else if (this.esf.grid.unpinnedColumns.indexOf(this.esf.column) === 0 && moveDirection === 0 &&
62-
this.esf.grid.isPinningToStart) {
63+
this.esf.column.pinningPosition === ColumnPinningPosition.Start) {
6364
targetColumn = this.esf.grid.pinnedColumns[this.esf.grid.pinnedColumns.length - 1];
6465
if (targetColumn.parent) {
6566
targetColumn = targetColumn.topLevelParent;
6667
}
6768
moveDirection = 1;
6869
} else if (this.esf.grid.unpinnedColumns.indexOf(this.esf.column) === this.esf.grid.unpinnedColumns.length - 1 &&
69-
moveDirection === 1 && !this.esf.grid.isPinningToStart) {
70+
moveDirection === 1 && this.esf.column.pinningPosition === ColumnPinningPosition.End) {
7071
targetColumn = this.esf.grid.pinnedColumns[0];
7172
moveDirection = 0;
7273
} else {

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2636,14 +2636,6 @@ export abstract class IgxGridBaseDirective implements GridType,
26362636
this._headSelectorTemplate = template;
26372637
}
26382638

2639-
/**
2640-
* @hidden
2641-
* @internal
2642-
*/
2643-
public get isPinningToStart() {
2644-
return this.pinning.columns !== ColumnPinningPosition.End;
2645-
}
2646-
26472639
/**
26482640
* @hidden
26492641
* @internal
@@ -7614,9 +7606,9 @@ export abstract class IgxGridBaseDirective implements GridType,
76147606
let columnIndex = typeof column === 'number' ? column : this.getColumnByName(column).visibleIndex;
76157607
const scrollRow = this.rowList.find(r => !!r.virtDirRow);
76167608
const virtDir = scrollRow ? scrollRow.virtDirRow : null;
7617-
if (this.isPinningToStart && this.pinnedColumns.length) {
7618-
if (columnIndex >= this.pinnedColumns.length) {
7619-
columnIndex -= this.pinnedColumns.length;
7609+
if (this.pinnedStartColumns.length) {
7610+
if (columnIndex >= this.pinnedStartColumns.length) {
7611+
columnIndex -= this.pinnedStartColumns.length;
76207612
this.scrollDirective(virtDir, columnIndex);
76217613
}
76227614
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class IgxGridRowComponent extends IgxRowDirective {
2727
}
2828

2929
public get mrlRightPinnedOffset(): string {
30-
return !this.grid.isPinningToStart ?
30+
return this.grid.pinnedStartColumns.length > 0 ?
3131
- this.grid.pinnedStartWidth - this.grid.headerFeaturesWidth + 'px' :
3232
null;
3333
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</div>
5050
}
5151

52-
@if (pinnedColumns.length > 0 && grid.isPinningToStart) {
52+
@if (pinnedStartColumns.length > 0) {
5353
<ng-template *ngTemplateOutlet="pinnedCellsTemplate; context: this"></ng-template>
5454
}
5555

@@ -82,7 +82,7 @@
8282
</igx-hierarchical-grid-cell>
8383
</ng-template>
8484

85-
@if (pinnedColumns.length > 0 && !grid.isPinningToStart) {
85+
@if (pinnedEndColumns.length > 0) {
8686
<ng-template *ngTemplateOutlet="pinnedCellsTemplate; context: this"></ng-template>
8787
}
8888

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<ng-template igxGridFor [igxGridForOf]="EMPTY_DATA" #scrollContainer>
9292
</ng-template>
9393
</div>
94-
<div class="igx-grid__scroll-end" [style.width.px]="pivotPinnedWidth" [style.min-width.px]="pivotPinnedWidth" [hidden]="pivotPinnedWidth === 0 || isPinningToStart"></div>
94+
<div class="igx-grid__scroll-end" [style.width.px]="pivotPinnedWidth" [style.min-width.px]="pivotPinnedWidth" [hidden]="pivotPinnedWidth === 0"></div>
9595
</div>
9696

9797
<div class="igx-grid__tfoot" role="rowgroup" #tfoot>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
13071307

13081308
/** @hidden @internal */
13091309
public get pivotPinnedWidth() {
1310-
return !this._init ? (this.isPinningToStart ? this.pinnedStartWidth : this.headerFeaturesWidth) : 0;
1310+
return !this._init ? (this.pinnedStartColumns.length > 0 ? this.pinnedStartWidth : this.headerFeaturesWidth) : 0;
13111311
}
13121312

13131313
/** @hidden @internal */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
(pointerdown)="$event.preventDefault()"
88
></div>
99
}
10-
@if (pinnedColumns.length > 0 && grid.isPinningToStart) {
10+
@if (pinnedStartColumns.length > 0) {
1111
<ng-container *ngTemplateOutlet="summaryCellTemplate; context: getContext(this)"></ng-container>
1212
}
1313
<ng-template igxGridFor let-col [igxGridForOf]="unpinnedColumns | igxNotGrouped" [igxForScrollContainer]="grid.parentVirtDir" let-colIndex="index" [igxForScrollOrientation]="'horizontal'" [igxForContainerSize]="grid.unpinnedWidth" [igxForTrackBy]="grid.trackColumnChanges" [igxForSizePropName]='"calcPixelWidth"' #igxDirRef>
@@ -31,7 +31,7 @@
3131
[style.flex-basis]="col.resolvedWidth">
3232
</igx-grid-summary-cell>
3333
</ng-template>
34-
@if (pinnedColumns.length > 0 && !grid.isPinningToStart) {
34+
@if (pinnedEndColumns.length > 0) {
3535
<ng-container *ngTemplateOutlet="summaryCellTemplate; context: getContext(this)"></ng-container>
3636
}
3737
}

projects/igniteui-angular/src/lib/grids/summaries/summary-row.component.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,22 @@ export class IgxSummaryRowComponent implements DoCheck {
107107
return this.grid.pinnedColumns;
108108
}
109109

110+
111+
/**
112+
* @hidden
113+
*/
114+
public get pinnedStartColumns(): ColumnType[] {
115+
return this.grid.pinnedStartColumns;
116+
}
117+
118+
119+
/**
120+
* @hidden
121+
*/
122+
public get pinnedEndColumns(): ColumnType[] {
123+
return this.grid.pinnedEndColumns;
124+
}
125+
110126
/**
111127
* @hidden
112128
*/

0 commit comments

Comments
 (0)