Merge branch 'master' into bpenkov/overlay-close-on-escape

Author: Lipata

projects/igniteui-angular/migrations/update-10_1_0/index.spec.ts

@@ -65,4 +65,44 @@ describe('Update 10.1.0', () => {
             private actionIcon: IgxNavbarActionDirective; }`);
     });
 
+    it('should update DropPosition.None', async () => {
+        const origFileContent =
+            `import { Component, Injectable, ViewChild } from "@angular/core";` +
+            `import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
+            `import { IgxColumnComponent } from "igniteui-angular";\r\n` +
+            `@Component({` +
+            `    providers: [RemoteService]` +
+            `})` +
+            `export class GridSampleComponent {` +
+            `    @ViewChild("grid1", { read: IgxGridComponent }) public grid1: IgxGridComponent;` +
+            `    public move() {` +
+            `        const column: IgxColumnComponent = this.grid1.columns[0];` +
+            `        const column2: IgxColumnComponent = this.grid1.columns[1];` +
+            `        this.grid1.moveColumn(col1, col2, DropPosition.None);` +
+            `    }` +
+            `}`;
+        const expectedFileContent =
+            `import { Component, Injectable, ViewChild } from "@angular/core";` +
+            `import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
+            `import { IgxColumnComponent } from "igniteui-angular";\r\n` +
+            `@Component({` +
+            `    providers: [RemoteService]` +
+            `})` +
+            `export class GridSampleComponent {` +
+            `    @ViewChild("grid1", { read: IgxGridComponent }) public grid1: IgxGridComponent;` +
+            `    public move() {` +
+            `        const column: IgxColumnComponent = this.grid1.columns[0];` +
+            `        const column2: IgxColumnComponent = this.grid1.columns[1];` +
+            `        this.grid1.moveColumn(col1, col2, DropPosition.AfterDropTarget);` +
+            `    }` +
+            `}`;
+        appTree.create(
+            '/testSrc/appPrefix/component/drop.component.ts',
+            origFileContent);
+
+        const tree = await schematicRunner.runSchematicAsync('migration-16', {}, appTree).toPromise();
+        expect(tree.readContent('/testSrc/appPrefix/component/drop.component.ts'))
+            .toEqual(expectedFileContent);
+    });
+
 });

projects/igniteui-angular/migrations/update-10_1_0/index.ts

@@ -3,15 +3,32 @@ import {
     SchematicContext,
     Tree
 } from '@angular-devkit/schematics';
-import { UpdateChanges, InputPropertyType, BoundPropertyObject } from '../common/UpdateChanges';
+import { UpdateChanges } from '../common/UpdateChanges';
+import {  getIdentifierPositions } from '../common/tsUtils';
 
 const version = '10.1.0';
 
-export default function (): Rule {
+export default function(): Rule {
     return (host: Tree, context: SchematicContext) => {
         context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
 
         const update = new UpdateChanges(__dirname, host, context);
         update.applyChanges();
+
+        // replace DropPosition.None with DropPosition.AfterDropTarget
+        for (const entryPath of update.tsFiles) {
+            let content = host.read(entryPath).toString();
+            if (content.indexOf('DropPosition.None') !== -1) {
+                const pos = getIdentifierPositions(content, 'DropPosition');
+                for (let i = pos.length; i--;) {
+                    const end = pos[i].end + 5;
+                    const isMatch = content.slice(pos[i].start, end) === 'DropPosition.None';
+                    if (isMatch) {
+                        content = content.slice(0, pos[i].start) + 'DropPosition.AfterDropTarget' + content.slice(end);
+                    }
+                }
+                host.overwrite(entryPath, content);
+            }
+        }
     };
 }

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

@@ -155,7 +155,6 @@ import { showMessage } from '../core/deprecateDecorators';
 
 const MINIMUM_COLUMN_WIDTH = 136;
 const FILTER_ROW_HEIGHT = 50;
-let warningShown = false;
 // By default row editing overlay outlet is inside grid body so that overlay is hidden below grid header when scrolling.
 // 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.
 // 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
      * grid.moveColumn(compName, persDetails);
      * ```
      */
-    public moveColumn(column: IgxColumnComponent, dropTarget: IgxColumnComponent, pos: DropPosition = DropPosition.None) {
+    public moveColumn(column: IgxColumnComponent, dropTarget: IgxColumnComponent, pos: DropPosition = DropPosition.AfterDropTarget) {
 
         if (column === dropTarget) {
             return;
         }
         let position = pos;
-        if (position === DropPosition.None) {
-            warningShown = showMessage(
-                'DropPosition.None is deprecated.' +
-                'Use DropPosition.AfterDropTarget instead.',
-                warningShown);
-            position = DropPosition.AfterDropTarget;
-        }
         if ((column.level !== dropTarget.level) ||
             (column.topLevelParent !== dropTarget.topLevelParent)) {
             return;
@@ -3869,8 +3861,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             if (!this.isPinningToStart) {
                 if (pos === DropPosition.AfterDropTarget) {
                     position = DropPosition.AfterDropTarget;
-                } else {
-                    position = DropPosition.None;
                 }
             }
             this._reorderColumns(column, dropTarget, position, this._pinnedColumns);
@@ -3893,8 +3883,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
                 position = DropPosition.BeforeDropTarget;
             } else if (pos === DropPosition.AfterDropTarget && fi > ti) {
                 position = DropPosition.AfterDropTarget;
-            } else {
-                position = DropPosition.None;
             }
         }
 

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

@@ -27,6 +27,7 @@ import {
     PinOnInitAndSelectionComponent
 } from '../../test-utils/grid-samples.spec';
 import { IgxGridComponent } from './grid.component';
+import { DropPosition } from '../moving/moving.service';
 // tslint:disable: no-use-before-declare
 
 describe('IgxGrid - Column Pinning #grid', () => {
@@ -585,7 +586,7 @@ describe('IgxGrid - Column Pinning #grid', () => {
             it('should pin an unpinned column when drag/drop it among pinned columns.', () => {
 
                 // move 'ID' column to the pinned area
-                grid.moveColumn(grid.getColumnByName('ID'), grid.getColumnByName('ContactName'));
+                grid.moveColumn(grid.getColumnByName('ID'), grid.getColumnByName('ContactName'), DropPosition.BeforeDropTarget);
                 fix.detectChanges();
 
                 // verify column is pinned at the correct place

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

@@ -2,13 +2,12 @@ import { Injectable } from '@angular/core';
 import { IgxColumnComponent } from '../columns/column.component';
 
 /**
- * This enumeration is used to configure whether the pinning possition is set before or after
- * the target. DropPosition.None is acting like DropPosition.AfterDropTarget.
+ * This enumeration is used to configure whether the drop position is set before or after
+ * the target.
  */
 export enum DropPosition {
     BeforeDropTarget,
-    AfterDropTarget,
-    None
+    AfterDropTarget
 }