Skip to content

Commit d624513

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Remove DropPosition.None from enum as it was deprecated. DropPosition can now only be Before or After. By default is after.
1 parent 7589b6f commit d624513

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ import { showMessage } from '../core/deprecateDecorators';
155155

156156
const MINIMUM_COLUMN_WIDTH = 136;
157157
const FILTER_ROW_HEIGHT = 50;
158-
let warningShown = false;
159158
// By default row editing overlay outlet is inside grid body so that overlay is hidden below grid header when scrolling.
160159
// 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.
161160
// Default row editing overlay height is higher then row height that is why the case is valid also for row with 2 rows.
@@ -3837,19 +3836,12 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38373836
* grid.moveColumn(compName, persDetails);
38383837
* ```
38393838
*/
3840-
public moveColumn(column: IgxColumnComponent, dropTarget: IgxColumnComponent, pos: DropPosition = DropPosition.None) {
3839+
public moveColumn(column: IgxColumnComponent, dropTarget: IgxColumnComponent, pos: DropPosition = DropPosition.AfterDropTarget) {
38413840

38423841
if (column === dropTarget) {
38433842
return;
38443843
}
38453844
let position = pos;
3846-
if (position === DropPosition.None) {
3847-
warningShown = showMessage(
3848-
'DropPosition.None is deprecated.' +
3849-
'Use DropPosition.AfterDropTarget instead.',
3850-
warningShown);
3851-
position = DropPosition.AfterDropTarget;
3852-
}
38533845
if ((column.level !== dropTarget.level) ||
38543846
(column.topLevelParent !== dropTarget.topLevelParent)) {
38553847
return;
@@ -3869,8 +3861,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38693861
if (!this.isPinningToStart) {
38703862
if (pos === DropPosition.AfterDropTarget) {
38713863
position = DropPosition.AfterDropTarget;
3872-
} else {
3873-
position = DropPosition.None;
38743864
}
38753865
}
38763866
this._reorderColumns(column, dropTarget, position, this._pinnedColumns);
@@ -3893,8 +3883,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38933883
position = DropPosition.BeforeDropTarget;
38943884
} else if (pos === DropPosition.AfterDropTarget && fi > ti) {
38953885
position = DropPosition.AfterDropTarget;
3896-
} else {
3897-
position = DropPosition.None;
38983886
}
38993887
}
39003888

projects/igniteui-angular/src/lib/grids/moving/moving.service.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import { Injectable } from '@angular/core';
22
import { IgxColumnComponent } from '../columns/column.component';
33

44
/**
5-
* This enumeration is used to configure whether the pinning possition is set before or after
6-
* the target. DropPosition.None is acting like DropPosition.AfterDropTarget.
5+
* This enumeration is used to configure whether the pinning position is set before or after
6+
* the target.
77
*/
88
export enum DropPosition {
99
BeforeDropTarget,
10-
AfterDropTarget,
11-
None
10+
AfterDropTarget
1211
}
1312

1413

0 commit comments

Comments
 (0)