Merge branch 'master' into nrobakova/refactor-esf-tests

Author: nrobakova

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes for each version of this project will be documented in this
 
 ## 9.1.0
 
+### New Features
+
+- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
+    - Added support for pinning columns on the right. Change the position of pinning using the new `pinning` input.
+    ```html
+    <igx-grid [data]="data" [pinning]="pinningConfiguration"></igx-grid>
+    ```
+    ```typescript
+    public pinningConfiguration: IPinningConfig = { columns: ColumnPinningPosition.End };
+    ```
+
 ### RTL Support
 - `igxSlider` have full right-to-left (RTL) support.
 

package.json

@@ -15,10 +15,10 @@
     "test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
     "test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
     "test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
-    "test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
-    "test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
-    "test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
-    "test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
+    "test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
+    "test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
+    "test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
+    "test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
     "test:lib:watch": "ng test igniteui-angular",
     "test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
     "build:lib": "ng build igniteui-angular --prod && gulp buildStyle",

projects/igniteui-angular/src/lib/directives/text-selection/text-selection.directive.spec.ts

@@ -56,11 +56,7 @@ describe('IgxSelection', () => {
         const template = ` <input type="text" [igxTextSelection]="false" #select="igxTextSelection"
             (click)="select.trigger()" value="Some custom value!" />`;
 
-        TestBed.overrideComponent(TriggerTextSelectionOnClickComponent, {
-            set: {
-                template
-            }
-        });
+        TestBed.overrideTemplateUsingTestingModule(TriggerTextSelectionOnClickComponent, template);
 
         TestBed.compileComponents().then(() => {
             const fix = TestBed.createComponent(TriggerTextSelectionOnClickComponent);

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

@@ -999,7 +999,8 @@ export class IgxColumnComponent implements AfterContentInit {
     }
 
     get isFirstPinned(): boolean {
-        return !this.grid.isPinningToStart && this.grid.pinnedColumns[0] === this;
+        const pinnedCols = this.grid.pinnedColumns.filter(x => !x.columnGroup);
+        return !this.grid.isPinningToStart && pinnedCols[0] === this;
     }
 
     get rightPinnedOffset(): string {

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

@@ -227,8 +227,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
 
     /**
      * Gets/Sets whether to autogenerate the columns.
-     *@remarks
-     * The default value is false.
+     * @remarks
+     * The default value is false. When set to true, it will override all columns declared through code or in markup.
      * @example
      * ```html
      * <igx-grid [data]="Data" [autoGenerate]="true"></igx-grid>

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

@@ -756,7 +756,7 @@ describe('Column Hiding UI #grid', () => {
             columnChooser.columnsAreaMaxHeight = '150px';
             fix.detectChanges();
             const columnsAreaDiv = columnChooserElement.query(By.css('div.igx-column-hiding__columns'));
-            expect(JSON.stringify(columnsAreaDiv.styles)).toBe('{"max-height":"150px"}');
+            expect(getComputedStyle(columnsAreaDiv.nativeElement).maxHeight).toBe('150px');
             expect(columnChooserElement.nativeElement.offsetHeight <= 255).toBe(true);
         });
 
@@ -800,23 +800,21 @@ describe('Column Hiding UI #grid', () => {
 
         it('indents columns according to their level.', () => {
             const items = columnChooser.columnItems;
-
             expect(items.filter((col) => col.calcIndent === 0).length).toBe(3);
             expect(items.filter((col) => col.calcIndent === 30).length).toBe(2);
             expect(items.filter((col) => col.calcIndent === 60).length).toBe(2);
 
             const columnItems = getColumnHidingItems();
-
-            const margin0 = '{"margin-left":"0px"}';
-            const margin1 = '{"margin-left":"30px"}';
-            const margin2 = '{"margin-left":"60px"}';
-            expect(JSON.stringify(columnItems[0].styles)).toBe(margin0);
-            expect(JSON.stringify(columnItems[1].styles)).toBe(margin0);
-            expect(JSON.stringify(columnItems[2].styles)).toBe(margin1);
-            expect(JSON.stringify(columnItems[3].styles)).toBe(margin1);
-            expect(JSON.stringify(columnItems[4].styles)).toBe(margin2);
-            expect(JSON.stringify(columnItems[5].styles)).toBe(margin2);
-            expect(JSON.stringify(columnItems[6].styles)).toBe(margin0);
+            const margin0 = '0px';
+            const margin30 = '30px';
+            const margin60 = '60px';
+            expect(getComputedStyle(columnItems[0].nativeElement).marginLeft).toBe(margin0);
+            expect(getComputedStyle(columnItems[1].nativeElement).marginLeft).toBe(margin0);
+            expect(getComputedStyle(columnItems[2].nativeElement).marginLeft).toBe(margin30);
+            expect(getComputedStyle(columnItems[3].nativeElement).marginLeft).toBe(margin30);
+            expect(getComputedStyle(columnItems[4].nativeElement).marginLeft).toBe(margin60);
+            expect(getComputedStyle(columnItems[5].nativeElement).marginLeft).toBe(margin60);
+            expect(getComputedStyle(columnItems[6].nativeElement).marginLeft).toBe(margin0);
         });
 
         it('checks & hides all children when hiding their parent.', fakeAsync(() => {