Skip to content

Commit c602088

Browse files
rkaraivanovrkaraivanov
authored
Merge branch '9.1.x' into bug-fix-slider-9.1.x
2 parents ac91781 + 8c2d1a2 commit c602088

File tree

15 files changed

+116
-88
lines changed

15 files changed

+116
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ All notable changes for each version of this project will be documented in this
77
### General
88
- `IgxHierarchicalGrid`
99
- `onGridInitialized` - New output has been exposed. Emitted after a grid is being initialized for the corresponding row island.
10-
10+
- **Behavioral Change** - When moving a column `DropPosition.None` is now acting like `DropPosition.AfterDropTarget`.
1111
## 9.1.0
1212

1313
### General

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

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,16 +1584,30 @@ export class IgxColumnComponent implements AfterContentInit {
15841584
this._pinned = true;
15851585
this.pinnedChange.emit(this._pinned);
15861586
this._unpinnedIndex = grid._unpinnedColumns.indexOf(this);
1587-
index = index !== undefined ? index : grid._pinnedColumns.length;
1587+
const rootPinnedCols = grid._pinnedColumns.filter((c) => c.level === 0);
1588+
index = index !== undefined ? index : rootPinnedCols.length;
15881589
const targetColumn = grid._pinnedColumns[index];
15891590
const args = { column: this, insertAtIndex: index, isPinned: true };
15901591
grid.onColumnPinning.emit(args);
15911592

15921593
if (grid._pinnedColumns.indexOf(this) === -1) {
1593-
grid._pinnedColumns.splice(args.insertAtIndex, 0, this);
1594+
if (!grid.hasColumnGroups) {
1595+
grid._pinnedColumns.splice(args.insertAtIndex, 0, this);
1596+
} else {
1597+
// insert based only on root collection
1598+
rootPinnedCols.splice(args.insertAtIndex, 0, this);
1599+
let allPinned = [];
1600+
// re-create hierarchy
1601+
rootPinnedCols.forEach(group => {
1602+
allPinned.push(group);
1603+
allPinned = allPinned.concat(group.allChildren);
1604+
});
1605+
grid._pinnedColumns = allPinned;
1606+
}
15941607

15951608
if (grid._unpinnedColumns.indexOf(this) !== -1) {
1596-
grid._unpinnedColumns.splice(grid._unpinnedColumns.indexOf(this), 1);
1609+
const childrenCount = this.allChildren.length;
1610+
grid._unpinnedColumns.splice(grid._unpinnedColumns.indexOf(this), 1 + childrenCount);
15971611
}
15981612
}
15991613

@@ -1650,13 +1664,16 @@ export class IgxColumnComponent implements AfterContentInit {
16501664

16511665
const targetColumn = grid._unpinnedColumns[index];
16521666

1653-
grid._unpinnedColumns.splice(index, 0, this);
1654-
if (grid._pinnedColumns.indexOf(this) !== -1) {
1655-
grid._pinnedColumns.splice(grid._pinnedColumns.indexOf(this), 1);
1667+
if (!hasIndex) {
1668+
grid._unpinnedColumns.splice(index, 0, this);
1669+
if (grid._pinnedColumns.indexOf(this) !== -1) {
1670+
grid._pinnedColumns.splice(grid._pinnedColumns.indexOf(this), 1);
1671+
}
16561672
}
16571673

1674+
16581675
if (hasIndex) {
1659-
grid._moveColumns(this, targetColumn);
1676+
grid.moveColumn(this, targetColumn);
16601677
}
16611678

16621679
if (this.columnGroup) {

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

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,11 @@ import { IgxColumnGroupComponent } from './columns/column-group.component';
149149
import { IGridSortingStrategy } from '../data-operations/sorting-strategy';
150150
import { IgxRowDragGhostDirective, IgxDragIndicatorIconDirective } from './row-drag.directive';
151151
import { isNumber } from 'util';
152+
import { showMessage } from '../core/deprecateDecorators';
152153

153154
const MINIMUM_COLUMN_WIDTH = 136;
154155
const FILTER_ROW_HEIGHT = 50;
155-
156+
let warningShown = false;
156157
// By default row editing overlay outlet is inside grid body so that overlay is hidden below grid header when scrolling.
157158
// In cases when grid has 1-2 rows there isn't enough space in grid body and row editing overlay should be shown above header.
158159
// Default row editing overlay height is higher then row height that is why the case is valid also for row with 2 rows.
@@ -3758,21 +3759,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
37583759
*/
37593760
protected _moveColumns(from: IgxColumnComponent, to: IgxColumnComponent, pos: DropPosition) {
37603761
const list = this.columnList.toArray();
3761-
const fromIndex = list.indexOf(from);
3762-
let toIndex = list.indexOf(to);
3763-
3764-
if (pos === DropPosition.BeforeDropTarget) {
3765-
toIndex--;
3766-
if (toIndex < 0) {
3767-
toIndex = 0;
3768-
}
3769-
}
3770-
3771-
if (pos === DropPosition.AfterDropTarget) {
3772-
toIndex++;
3773-
}
3774-
3775-
list.splice(toIndex, 0, ...list.splice(fromIndex, 1));
3762+
this._reorderColumns(from, to, pos, list);
37763763
const newList = this._resetColumnList(list);
37773764
this.columnList.reset(newList);
37783765
this.columnList.notifyOnChanges();
@@ -3800,39 +3787,27 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38003787
* @hidden
38013788
*/
38023789
protected _reorderColumns(from: IgxColumnComponent, to: IgxColumnComponent, position: DropPosition, columnCollection: any[]) {
3803-
let dropIndex = columnCollection.indexOf(to);
3804-
3805-
if (to.columnGroup) {
3806-
dropIndex += to.allChildren.length;
3807-
}
3790+
const fromIndex = columnCollection.indexOf(from);
3791+
const childColumnsCount = from.allChildren.length;
3792+
// remove item(s) to be moved.
3793+
const fromCollection = columnCollection.splice(fromIndex, childColumnsCount + 1);
38083794

3809-
if (position === DropPosition.BeforeDropTarget) {
3810-
dropIndex--;
3811-
}
3795+
let dropIndex = columnCollection.indexOf(to);
38123796

38133797
if (position === DropPosition.AfterDropTarget) {
38143798
dropIndex++;
3799+
if (to.columnGroup) {
3800+
dropIndex += to.allChildren.length;
3801+
}
38153802
}
3816-
3817-
columnCollection.splice(dropIndex, 0, ...columnCollection.splice(columnCollection.indexOf(from), 1));
3803+
columnCollection.splice(dropIndex, 0, ...fromCollection);
38183804
}
38193805
/**
38203806
* @hidden
38213807
*/
38223808
protected _moveChildColumns(parent: IgxColumnComponent, from: IgxColumnComponent, to: IgxColumnComponent, pos: DropPosition) {
38233809
const buffer = parent.children.toArray();
3824-
const fromIndex = buffer.indexOf(from);
3825-
let toIndex = buffer.indexOf(to);
3826-
3827-
if (pos === DropPosition.BeforeDropTarget) {
3828-
toIndex--;
3829-
}
3830-
3831-
if (pos === DropPosition.AfterDropTarget) {
3832-
toIndex++;
3833-
}
3834-
3835-
buffer.splice(toIndex, 0, ...buffer.splice(fromIndex, 1));
3810+
this._reorderColumns(from, to, pos, buffer);
38363811
parent.children.reset(buffer);
38373812
}
38383813
/**
@@ -3844,19 +3819,17 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38443819
*/
38453820
public moveColumn(column: IgxColumnComponent, dropTarget: IgxColumnComponent, pos: DropPosition = DropPosition.None) {
38463821

3822+
if (column === dropTarget) {
3823+
return;
3824+
}
38473825
let position = pos;
3848-
const fromIndex = column.visibleIndex;
3849-
const toIndex = dropTarget.visibleIndex;
3850-
3851-
if (pos === DropPosition.BeforeDropTarget && fromIndex < toIndex) {
3852-
position = DropPosition.BeforeDropTarget;
3853-
} else if (pos === DropPosition.AfterDropTarget && fromIndex > toIndex) {
3854-
position = DropPosition.AfterDropTarget;
3855-
} else {
3856-
position = DropPosition.None;
3826+
if (position === DropPosition.None) {
3827+
warningShown = showMessage(
3828+
'DropPosition.None is deprecated.' +
3829+
'Use DropPosition.AfterDropTarget instead.',
3830+
warningShown);
3831+
position = DropPosition.AfterDropTarget;
38573832
}
3858-
3859-
38603833
if ((column.level !== dropTarget.level) ||
38613834
(column.topLevelParent !== dropTarget.topLevelParent)) {
38623835
return;
@@ -3914,6 +3887,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
39143887
if (this.hasColumnLayouts) {
39153888
this.columns.filter(x => x.columnLayout).forEach(x => x.populateVisibleIndexes());
39163889
}
3890+
// after reordering is done reset cached column collections.
3891+
this.resetColumnCollections();
3892+
column.resetCaches();
39173893

39183894
const args = {
39193895
source: column,
@@ -5197,8 +5173,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
51975173
* @hidden
51985174
*/
51995175
protected reinitPinStates() {
5200-
this._pinnedColumns = (this.hasColumnGroups) ? this.columnList.filter((c) => c.pinned) :
5201-
this.columnList.filter((c) => c.pinned).sort((a, b) => this._pinnedColumns.indexOf(a) - this._pinnedColumns.indexOf(b));
5176+
this._pinnedColumns = this.columnList
5177+
.filter((c) => c.pinned).sort((a, b) => this._pinnedColumns.indexOf(a) - this._pinnedColumns.indexOf(b));
52025178
this._unpinnedColumns = this.hasColumnGroups ? this.columnList.filter((c) => !c.pinned) :
52035179
this.columnList.filter((c) => !c.pinned)
52045180
.sort((a, b) => this._unpinnedColumns.indexOf(a) - this._unpinnedColumns.indexOf(b));

‎projects/igniteui-angular/src/lib/grids/grid/column-group.spec.ts‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { configureTestSuite } from '../../test-utils/configure-suite';
1414
import { IgxGridHeaderComponent } from '../headers/grid-header.component';
1515
import { GridSummaryFunctions } from '../../test-utils/grid-functions.spec';
1616
import { wait } from '../../test-utils/ui-interactions.spec';
17+
import { DropPosition } from '../moving/moving.service';
1718

1819
const GRID_COL_THEAD_TITLE_CLASS = 'igx-grid__th-title';
1920
const GRID_COL_GROUP_THEAD_TITLE_CLASS = 'igx-grid__thead-title';
@@ -786,10 +787,10 @@ describe('IgxGrid - multi-column headers #grid', () => {
786787
const ci = fixture.componentInstance;
787788
const grid = ci.grid;
788789

789-
ci.idCol.pinned = true;
790+
ci.genInfoColGroup.pinned = true;
790791
tick();
791792
fixture.detectChanges();
792-
ci.genInfoColGroup.pinned = true;
793+
ci.idCol.pinned = true;
793794
tick();
794795
fixture.detectChanges();
795796
ci.postalCodeColGroup.pinned = true;
@@ -799,13 +800,14 @@ describe('IgxGrid - multi-column headers #grid', () => {
799800
tick();
800801
fixture.detectChanges();
801802

802-
testColumnsVisibleIndexes([ci.idCol].concat(ci.genInfoColList)
803+
testColumnsVisibleIndexes(ci.genInfoColList.concat(ci.idCol)
803804
.concat(ci.postalCodeColList).concat(ci.cityColList).concat(ci.countryColList)
804805
.concat(ci.regionColList).concat(ci.addressColList).concat(ci.phoneColList)
805806
.concat(ci.faxColList));
806807

807808
// unpinning with index
808809
expect(grid.unpinColumn(ci.genInfoColGroup, 2)).toBe(true);
810+
fixture.detectChanges();
809811
const postUnpinningColList = [ci.idCol].concat(ci.postalCodeColList).concat(ci.cityColList)
810812
.concat(ci.countryColList).concat(ci.regionColList).concat(ci.genInfoColList)
811813
.concat(ci.addressColList).concat(ci.phoneColList).concat(ci.faxColList);
@@ -814,31 +816,34 @@ describe('IgxGrid - multi-column headers #grid', () => {
814816

815817
// pinning to non-existent index
816818
expect(grid.pinColumn(ci.genInfoColGroup, 15)).toBe(false);
819+
fixture.detectChanges();
817820
testColumnsVisibleIndexes(postUnpinningColList);
818821
testColumnPinning(ci.genInfoColGroup, false);
819822

820823
// pinning to negative index
821824
expect(grid.pinColumn(ci.genInfoColGroup, -15)).toBe(false);
825+
fixture.detectChanges();
822826
testColumnsVisibleIndexes(postUnpinningColList);
823827
testColumnPinning(ci.genInfoColGroup, false);
824828

825829
// pinning with index
826830
expect(grid.pinColumn(ci.genInfoColGroup, 2)).toBe(true);
831+
fixture.detectChanges();
827832
const postPinningColList = [ci.idCol].concat(ci.postalCodeColList).concat(ci.genInfoColList)
828833
.concat(ci.cityColList).concat(ci.countryColList).concat(ci.regionColList)
829834
.concat(ci.addressColList).concat(ci.phoneColList).concat(ci.faxColList);
830835
testColumnsVisibleIndexes(postPinningColList);
831836
testColumnPinning(ci.genInfoColGroup, true);
832837

833-
// unpinning to non-existent index
834-
expect(grid.unpinColumn(ci.genInfoColGroup, 15)).toBe(false);
835-
testColumnsVisibleIndexes(postPinningColList);
836-
testColumnPinning(ci.genInfoColGroup, true);
838+
// // unpinning to non-existent index
839+
// expect(grid.unpinColumn(ci.genInfoColGroup, 15)).toBe(false);
840+
// testColumnsVisibleIndexes(postPinningColList);
841+
// testColumnPinning(ci.genInfoColGroup, true);
837842

838-
// unpinning to negative index
839-
expect(grid.unpinColumn(ci.genInfoColGroup, -15)).toBe(false);
840-
testColumnsVisibleIndexes(postPinningColList);
841-
testColumnPinning(ci.genInfoColGroup, true);
843+
// // unpinning to negative index
844+
// expect(grid.unpinColumn(ci.genInfoColGroup, -15)).toBe(false);
845+
// testColumnsVisibleIndexes(postPinningColList);
846+
// testColumnPinning(ci.genInfoColGroup, true);
842847
}));
843848

844849
it('Should initially pin the whole group when one column of the group is pinned', fakeAsync(() => {
@@ -927,7 +932,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
927932
testColumnsOrder(genInfoCols.concat(locCols).concat(contactInfoCols));
928933

929934
// moving last to be first
930-
grid.moveColumn(ci.contactInfoColGroup, ci.genInfoColGroup);
935+
grid.moveColumn(ci.contactInfoColGroup, ci.genInfoColGroup, DropPosition.BeforeDropTarget);
931936
tick();
932937
fixture.detectChanges();
933938
testColumnsOrder(contactInfoCols.concat(genInfoCols).concat(locCols));
@@ -945,7 +950,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
945950
testColumnsOrder(genInfoCols.concat(contactInfoCols).concat(locCols));
946951

947952
// moving inner to be first
948-
grid.moveColumn(ci.contactInfoColGroup, ci.genInfoColGroup);
953+
grid.moveColumn(ci.contactInfoColGroup, ci.genInfoColGroup, DropPosition.BeforeDropTarget);
949954
tick();
950955
fixture.detectChanges();
951956
testColumnsOrder(contactInfoCols.concat(genInfoCols).concat(locCols));
@@ -973,7 +978,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
973978
ci.regionCol, ci.cityCol];
974979

975980
// moving last to be first
976-
grid.moveColumn(ci.postalCodeCol, ci.phoneCol);
981+
grid.moveColumn(ci.postalCodeCol, ci.phoneCol, DropPosition.BeforeDropTarget);
977982
tick();
978983
fixture.detectChanges();
979984
testColumnsOrder(genInfoAndLocCols.concat([ci.contactInfoColGroup,
@@ -994,7 +999,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
994999
ci.phoneCol, ci.postalCodeCol, ci.faxCol]));
9951000

9961001
// moving inner to be first
997-
grid.moveColumn(ci.postalCodeCol, ci.phoneCol);
1002+
grid.moveColumn(ci.postalCodeCol, ci.phoneCol, DropPosition.BeforeDropTarget);
9981003
tick();
9991004
fixture.detectChanges();
10001005
testColumnsOrder(genInfoAndLocCols.concat([ci.contactInfoColGroup,
@@ -1029,14 +1034,14 @@ describe('IgxGrid - multi-column headers #grid', () => {
10291034
const grid = ci.grid;
10301035

10311036
// moving a two-level col
1032-
grid.moveColumn(ci.phoneCol, ci.locationColGroup);
1037+
grid.moveColumn(ci.phoneCol, ci.locationColGroup, DropPosition.BeforeDropTarget);
10331038
tick();
10341039
fixture.detectChanges();
10351040
testColumnsOrder([ci.contactInfoColGroup, ci.phoneCol, ci.locationColGroup, ci.countryCol,
10361041
ci.genInfoColGroup, ci.companyNameCol, ci.cityCol]);
10371042

10381043
// moving a three-level col
1039-
grid.moveColumn(ci.cityCol, ci.contactInfoColGroup);
1044+
grid.moveColumn(ci.cityCol, ci.contactInfoColGroup, DropPosition.BeforeDropTarget);
10401045
tick();
10411046
fixture.detectChanges();
10421047
const colsOrder = [ci.cityCol, ci.contactInfoColGroup, ci.phoneCol,
@@ -1090,7 +1095,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
10901095
fixture.detectChanges();
10911096

10921097
// moving group from unpinned to pinned
1093-
ci.grid.moveColumn(ci.phoneColGroup, ci.idCol);
1098+
ci.grid.moveColumn(ci.phoneColGroup, ci.idCol, DropPosition.BeforeDropTarget);
10941099
tick();
10951100
fixture.detectChanges();
10961101
let postMovingOrder = ci.phoneColList.concat([ci.idCol]).concat(ci.genInfoColList)

‎projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { GridSelectionMode } from '../common/enums';
1818
import { GridSelectionFunctions, GridFunctions } from '../../test-utils/grid-functions.spec';
1919
import { DefaultSortingStrategy } from '../../data-operations/sorting-strategy';
2020
import { DebugElement } from '@angular/core';
21+
import { DropPosition } from '../moving/moving.service';
2122

2223
describe('IgxGrid - Cell selection #grid', () => {
2324
configureTestSuite();
@@ -2287,7 +2288,7 @@ describe('IgxGrid - Cell selection #grid', () => {
22872288
grid.primaryKey = 'ID';
22882289
fix.detectChanges();
22892290

2290-
grid.moveColumn(grid.getColumnByName('ParentID'), grid.getColumnByName('ID'));
2291+
grid.moveColumn(grid.getColumnByName('ParentID'), grid.getColumnByName('ID'), DropPosition.BeforeDropTarget);
22912292
fix.detectChanges();
22922293
const newSelectedData = [
22932294
{ ID: 317, Name: 'Monica Reyes', HireDate: new Date('Sep 18, 2014') },

‎projects/igniteui-angular/src/lib/grids/grid/grid-collapsible-columns.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1212
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
1313
import { SortingDirection } from '../../data-operations/sorting-expression.interface';
14+
import { DropPosition } from '../moving/moving.service';
1415

1516
describe('IgxGrid - multi-column headers #grid', () => {
1617
configureTestSuite();
@@ -560,7 +561,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
560561
expect(generalInf.collapsible).toBeFalsy();
561562
expect(generalInf.visibleIndex).toBe(1);
562563

563-
grid.moveColumn(generalInf, addressInf);
564+
grid.moveColumn(generalInf, addressInf, DropPosition.AfterDropTarget);
564565
fixture.detectChanges();
565566

566567
expect(addressInf.expanded).toBeTruthy();
@@ -570,7 +571,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
570571
fixture.detectChanges();
571572

572573
expect(addressInf.expanded).toBeFalsy();
573-
grid.moveColumn(generalInf, addressInf);
574+
grid.moveColumn(generalInf, addressInf, DropPosition.BeforeDropTarget);
574575
fixture.detectChanges();
575576

576577
expect(addressInf.expanded).toBeFalsy();

0 commit comments

Comments
 (0)