Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into ddincheva/calendarKB

ddincheva · ddincheva · commit 3db55a79fbf6 · 2020-10-09T16:00:18.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts
@@ -1168,7 +1168,7 @@ describe('IgxGrid - multi-row-layout #grid', () => {
 
 @Component({
     template: `
-    <igx-grid #grid [data]="data" height="500px">
+    <igx-grid #grid [data]="data" height="500px" [rowEditable]='true' [primaryKey]="'ID'">
         <igx-column-layout *ngFor='let group of colGroups'>
             <igx-column *ngFor='let col of group.columns'
             [rowStart]="col.rowStart" [colStart]="col.colStart" [width]='col.width'
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts
@@ -0,0 +1,70 @@
+import { async, TestBed, fakeAsync } from '@angular/core/testing';
+import { IgxHierarchicalGridModule, IgxHierarchicalGridComponent } from './public_api';
+import { configureTestSuite } from '../../test-utils/configure-suite';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { IgxActionStripModule, IgxActionStripComponent } from '../../action-strip/public_api';
+import { IgxHierarchicalGridActionStripComponent } from '../../test-utils/hierarchical-grid-components.spec';
+import { wait } from '../../test-utils/ui-interactions.spec';
+
+describe('IgxHierarchicalGrid - Add Row UI #tGrid', () => {
+    configureTestSuite();
+    let fixture;
+    let hierarchicalGrid: IgxHierarchicalGridComponent;
+    let actionStrip: IgxActionStripComponent;
+    beforeAll(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [
+                IgxHierarchicalGridActionStripComponent
+            ],
+            imports: [IgxHierarchicalGridModule, NoopAnimationsModule, IgxActionStripModule]
+        })
+            .compileComponents();
+    }));
+
+    describe(' Basic', () => {
+        beforeEach(fakeAsync(/** height/width setter rAF */() => {
+            fixture = TestBed.createComponent(IgxHierarchicalGridActionStripComponent);
+            fixture.detectChanges();
+            hierarchicalGrid = fixture.componentInstance.hgrid;
+            actionStrip = fixture.componentInstance.actionStrip;
+        }));
+
+        it('Should collapse an expanded record when beginAddRow is called for it', () => {
+            const row = hierarchicalGrid.rowList.first;
+            hierarchicalGrid.expandRow(row.rowID);
+            fixture.detectChanges();
+            expect(row.expanded).toBeTrue();
+
+            row.beginAddRow();
+            fixture.detectChanges();
+            expect(row.expanded).toBeFalse();
+            expect(hierarchicalGrid.getRowByIndex(1).addRow).toBeTrue();
+        });
+
+        it('Should allow the expansion of a newly added (commited) record', async() => {
+            const row = hierarchicalGrid.rowList.first;
+            hierarchicalGrid.expandRow(row.rowID);
+            fixture.detectChanges();
+            expect(row.expanded).toBeTrue();
+
+            row.beginAddRow();
+            fixture.detectChanges();
+            expect(row.expanded).toBeFalse();
+            expect(hierarchicalGrid.getRowByIndex(1).addRow).toBeTrue();
+            hierarchicalGrid.endEdit(true);
+            fixture.detectChanges();
+            hierarchicalGrid.addRowSnackbar.triggerAction();
+            fixture.detectChanges();
+
+            await wait(100);
+            fixture.detectChanges();
+
+            const newRowData = hierarchicalGrid.data[hierarchicalGrid.data.length - 1];
+            const newRow = hierarchicalGrid.rowList.find(r => r.rowID === newRowData[hierarchicalGrid.primaryKey]);
+            expect(newRow.expanded).toBeFalse();
+            hierarchicalGrid.expandRow(newRow.rowID);
+            fixture.detectChanges();
+            expect(newRow.expanded).toBeTrue();
+        });
+    });
+});
diff --git a/projects/igniteui-angular/src/lib/services/overlay/overlay.ts b/projects/igniteui-angular/src/lib/services/overlay/overlay.ts
@@ -150,8 +150,8 @@ export class IgxOverlayService implements OnDestroy {
      */
     public static createRelativeOverlaySettings(
         target: Point | HTMLElement,
-        strategy?: RelativePositionStrategy,
-        position?: RelativePosition):
+        position?: RelativePosition,
+        strategy?: RelativePositionStrategy):
         OverlaySettings {
         const positionSettings = this.createRelativePositionSettings(position);
         const overlaySettings: OverlaySettings = {
diff --git a/projects/igniteui-angular/src/lib/services/overlay/utilities.ts b/projects/igniteui-angular/src/lib/services/overlay/utilities.ts
@@ -21,34 +21,31 @@ export enum VerticalAlignment {
 /**
  * Defines the possible values of the overlays' position strategy.
  */
-export const RelativePositionStrategy = mkenum({
-    Connected: 'connected',
-    Auto: 'auto',
-    Elastic: 'elastic'
-});
-export type RelativePositionStrategy = (typeof RelativePositionStrategy)[keyof typeof RelativePositionStrategy];
+export enum RelativePositionStrategy {
+    Connected = 'connected',
+    Auto = 'auto',
+    Elastic = 'elastic'
+}
 
 /**
  * Defines the possible positions for the relative overlay settings presets.
  */
-export const RelativePosition = mkenum({
-    Above: 'above',
-    Below: 'below',
-    Before: 'before',
-    After: 'after',
-    Default: 'default'
-});
-export type RelativePosition = (typeof RelativePosition)[keyof typeof RelativePosition];
+export enum RelativePosition {
+    Above = 'above',
+    Below = 'below',
+    Before = 'before',
+    After = 'after',
+    Default = 'default'
+}
 
 /**
  * Defines the possible positions for the absolute overlay settings presets.
  */
-export const AbsolutePosition = mkenum({
-    Bottom: 'bottom',
-    Top: 'top',
-    Center: 'center'
-});
-export type AbsolutePosition = (typeof AbsolutePosition)[keyof typeof AbsolutePosition];
+export enum AbsolutePosition {
+    Bottom = 'bottom',
+    Top = 'top',
+    Center = 'center'
+}
 
 export class Point {
     constructor(public x: number, public y: number) { }
diff --git a/projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts b/projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts
@@ -2168,9 +2168,9 @@ export class MRLTestComponent {
 @Component({
     template: `
 <igx-grid #grid [data]="data" [width]="'800px'" [height]="'500px'"
-    [rowEditable]="true" [primaryKey]="'ID'">
+    [rowEditable]="true" [primaryKey]="'ID'" [allowFiltering]="true">
     <igx-column *ngFor="let c of columns" [sortable]="true" [field]="c.field" [header]="c.field"
-        [width]="c.width">
+        [width]="c.width" [movable]='true' [resizable]='true'>
     </igx-column>
 
     <igx-action-strip #actionStrip>
diff --git a/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts b/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts
@@ -8,6 +8,7 @@ import { IPinningConfig } from '../grids/grid.common';
 import { ColumnPinningPosition, RowPinningPosition } from '../grids/common/enums';
 import { IgxActionStripComponent } from '../action-strip/public_api';
 
+
 @Component({
     template: `
     <igx-hierarchical-grid #grid1 [data]="data" [allowFiltering]="true" [rowEditable]="true" [pinning]='pinningConfig'
@@ -209,11 +210,10 @@ export class IgxHierarchicalGridCustomSelectorsComponent implements OnInit {
 })
 export class IgxHierarchicalGridTestCustomToolbarComponent extends IgxHierarchicalGridTestBaseComponent { }
 
-
 @Component({
     template: `
     <igx-hierarchical-grid #grid1 [data]="data" [height]="'600px'" [width]="'700px'" #hierarchicalGrid
-        [primaryKey]="'ID'" [showToolbar]="true" [autoGenerate]="true">
+        [primaryKey]="'ID'" [showToolbar]="true" [autoGenerate]="true" [rowEditable]='true'>
         <igx-action-strip #actionStrip1>
             <igx-grid-pinning-actions></igx-grid-pinning-actions>
             <igx-grid-editing-actions></igx-grid-editing-actions>
diff --git a/src/app/overlay/overlay-presets.sample.ts b/src/app/overlay/overlay-presets.sample.ts
@@ -2,16 +2,7 @@ import { Component, ViewChild, ElementRef, ChangeDetectorRef, OnInit } from '@an
 import {
     IgxDropDownComponent,
     OverlaySettings,
-    AutoPositionStrategy,
-    GlobalPositionStrategy,
-    ConnectedPositioningStrategy,
-    AbsoluteScrollStrategy,
-    BlockScrollStrategy,
-    CloseScrollStrategy,
-    NoOpScrollStrategy,
-    ElasticPositionStrategy,
     IgxDragDirective,
-    ContainerPositionStrategy,
     IgxOverlayService
 } from 'igniteui-angular';
 import { RelativePositionStrategy, AbsolutePosition, RelativePosition } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
@@ -33,12 +24,12 @@ export class OverlayPresetsSampleComponent implements OnInit {
     private yAddition = 0;
     items = [];
     itemsCount = 10;
-    relStrategies = ['Auto', 'Connected', 'Elastic'];
+    relStrategies = [RelativePositionStrategy.Auto, RelativePositionStrategy.Connected, RelativePositionStrategy.Elastic];
     absStrategies = ['Global', 'Container'];
     positionStrategy = 'Global';
     absPosition: AbsolutePosition = AbsolutePosition.Center;
     absPositions = [AbsolutePosition.Center, AbsolutePosition.Top, AbsolutePosition.Bottom];
-    relPosition: RelativePosition = RelativePosition.Below;
+    relPosition: RelativePosition;
     relPositions = [
         RelativePosition.Above,
         RelativePosition.Below,
@@ -47,7 +38,6 @@ export class OverlayPresetsSampleComponent implements OnInit {
         RelativePosition.Default];
 
     constructor(
-        private cdr: ChangeDetectorRef
     ) {
         for (let item = 0; item < this.itemsCount; item++) {
             this.items.push(`Item ${item}`);
@@ -58,18 +48,20 @@ export class OverlayPresetsSampleComponent implements OnInit {
         this._overlaySettings = IgxOverlayService.createAbsoluteOverlaySettings(this.absPosition);
     }
 
-    onChange(ev) {
+    onChange() {
         switch (this.positionStrategy) {
-            case 'Auto':
-            case 'Connected':
-            case 'Elastic':
+            case RelativePositionStrategy.Auto:
+            case RelativePositionStrategy.Connected:
+            case RelativePositionStrategy.Elastic:
                 this.absPosition = null;
+                this.relPosition = this.relPosition || RelativePosition.Default;
                 this._overlaySettings = IgxOverlayService.createRelativeOverlaySettings(
                     this.button.nativeElement,
-                    RelativePositionStrategy[this.positionStrategy],
-                    this.relPosition);
+                    this.relPosition,
+                    this.positionStrategy);
                 break;
             case 'Global':
+                this.relPosition = null;
                 this._overlaySettings = IgxOverlayService.createAbsoluteOverlaySettings(this.absPosition);
                 break;
             case 'Container':
