Skip to content

Commit 73218cf

Browse files
authored
Merge branch '15.1.x' into bpachilova/fix-13392-15.1.x
2 parents e35a3c4 + ee20383 commit 73218cf

File tree

8 files changed

+25
-12
lines changed

8 files changed

+25
-12
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@angular/platform-browser": "^15.2.0",
6262
"@angular/platform-browser-dynamic": "^15.2.0",
6363
"@angular/router": "^15.2.0",
64-
"@igniteui/material-icons-extended": "^2.10.0",
64+
"@igniteui/material-icons-extended": "^3.0.1",
6565
"@types/hammerjs": "^2.0.40",
6666
"@types/source-map": "0.5.2",
6767
"fflate": "^0.7.3",

projects/igniteui-angular-i18n/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"description": "IgniteUI for Angular localization resources package",
55
"main": "./index.js",
66
"types": "./index.d.ts",
7+
"sideEffects": false,
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/IgniteUI/igniteui-angular.git",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"lodash-es": "^4.17.21",
7878
"uuid": "^8.3.0",
7979
"igniteui-theming": "^1.4.1",
80-
"@igniteui/material-icons-extended": "^2.10.0"
80+
"@igniteui/material-icons-extended": "^3.0.0"
8181
},
8282
"peerDependencies": {
8383
"@angular/common": "^15.0.0",

projects/igniteui-angular/src/lib/buttonGroup/buttongroup.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Button {
4545

4646
describe('IgxButtonGroup', () => {
4747
configureTestSuite();
48-
beforeAll(waitForAsync(() => {
48+
beforeAll(waitForAsync(() => {
4949
TestBed.configureTestingModule({
5050
declarations: [
5151
InitButtonGroupComponent,
@@ -194,8 +194,8 @@ describe('IgxButtonGroup', () => {
194194
UIInteractions.simulateClickEvent(buttongroup.buttons[0].nativeElement);
195195
UIInteractions.simulateClickEvent(buttongroup.buttons[1].nativeElement);
196196
expect(buttongroup.selectedButtons.length).toBe(0);
197-
UIInteractions.simulateClickEvent(buttongroup.buttons[0].nativeElement);
198-
UIInteractions.simulateClickEvent(buttongroup.buttons[3].nativeElement);
197+
buttongroup.buttons[0].nativeElement.click();
198+
buttongroup.buttons[3].nativeElement.click();
199199
// Button 3 is disabled, and it should not be selected with mouse click
200200
expect(buttongroup.selectedButtons.length).toBe(1);
201201
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
21142114
}
21152115

21162116
if (hasIndex) {
2117-
grid._moveColumns(this, targetColumn);
2117+
index === grid._pinnedColumns.length - 1 ?
2118+
grid._moveColumns(this, targetColumn, DropPosition.AfterDropTarget) : grid._moveColumns(this, targetColumn, DropPosition.BeforeDropTarget);
21182119
}
21192120

21202121
if (this.columnGroup) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5092,7 +5092,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
50925092
* @param columnName
50935093
* @param index
50945094
*/
5095-
public pinColumn(columnName: string | IgxColumnComponent, index?): boolean {
5095+
public pinColumn(columnName: string | IgxColumnComponent, index?: number): boolean {
50965096
const col = columnName instanceof IgxColumnComponent ? columnName : this.getColumnByName(columnName);
50975097
return col.pin(index);
50985098
}
@@ -5107,7 +5107,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
51075107
* @param columnName
51085108
* @param index
51095109
*/
5110-
public unpinColumn(columnName: string | IgxColumnComponent, index?): boolean {
5110+
public unpinColumn(columnName: string | IgxColumnComponent, index?: number): boolean {
51115111
const col = columnName instanceof IgxColumnComponent ? columnName : this.getColumnByName(columnName);
51125112
return col.unpin(index);
51135113
}

projects/igniteui-angular/src/lib/grids/grid/grid.pinning.spec.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,17 @@ describe('IgxGrid - Column Pinning #grid', () => {
188188

189189
});
190190

191+
it('should pin the column on the last position if the index for the last position is provided', () => {
192+
grid.pinColumn('CompanyName');
193+
fix.detectChanges();
194+
195+
grid.pinColumn('City', 2);
196+
fix.detectChanges();
197+
198+
expect(grid.pinnedColumns.length).toEqual(3);
199+
expect(grid.pinnedColumns[2].field).toEqual('City');
200+
});
201+
191202
it('should correctly initialize pinned columns z-index values.', () => {
192203

193204
const headers = GridFunctions.getColumnHeaders(fix);

0 commit comments

Comments
 (0)