Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into pbozhinov/fix-6850

Author: 3phase

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

@@ -303,6 +303,8 @@
         overflow: hidden;
         outline-style: none;
         border-radius: --var($theme, 'border-radius');
+        min-height: 300px;
+        min-width: 300px;
     }
 
     %igx-carousel-slide {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_toast.scss

@@ -56,6 +56,10 @@ $_bootstrap-toast: extend(
     (
         variant: 'bootstrap',
         background: #fff,
+
+        text-color: (
+            igx-color: ('grays', 600)
+        )
     )
 );
 

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

@@ -2468,6 +2468,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
     private _unpinnedWidth = NaN;
     private _visibleColumns = [];
     private _columnGroups = false;
+    private _autoGeneratedCols = [];
     protected _headerFeaturesWidth = NaN;
 
     private _columnWidth: string;
@@ -4549,6 +4550,12 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
      */
     protected onColumnsChanged(change: QueryList<IgxColumnComponent>) {
         const diff = this.columnListDiffer.diff(change);
+        if (this.autoGenerate && this.columnList.length === 0 && this._autoGeneratedCols.length > 0) {
+            // In Ivy if there are nested conditional templates the content children are re-evaluated
+            // hence autogenerated columns are cleared and need to be reset.
+            this.columnList.reset(this._autoGeneratedCols);
+            return;
+        }
         if (diff) {
             let added = false;
             let removed = false;
@@ -4778,6 +4785,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             ref.changeDetectorRef.detectChanges();
             columns.push(ref.instance);
         });
+        this._autoGeneratedCols = columns;
 
         this.columnList.reset(columns);
         if (data && data.length > 0) {

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts

@@ -417,7 +417,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
     protected onColumnsChanged(change: QueryList<IgxColumnComponent>) {
         this.updateColumnList();
         const cols = change.filter(c => c.gridAPI.grid === this);
-        if (cols.length > 0) {
+        if (cols.length > 0 || this.autoGenerate) {
             this.columnList.reset(cols);
             super.onColumnsChanged(this.columnList);
         }

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

@@ -1080,8 +1080,7 @@ describe('IgxHierarchicalGrid Runtime Row Island change Scenarios #hGrid', () =>
         hierarchicalGrid = fixture.componentInstance.hgrid;
     }));
 
-    xit('should allow changing row islands runtime in root grid.', () => {
-        pending('Related to issue #6731');
+    it('should allow changing row islands runtime in root grid.', () => {
         const row = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
         UIInteractions.clickElement(row.expander);
         fixture.detectChanges();

projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts

@@ -146,14 +146,15 @@ describe('IgCircularBar', () => {
     }));
 
     it('Should update value when we try to decrease it (without animation)', () => {
-        pending('Related to the bug #6740');
         const fixture = TestBed.createComponent(CircularBarComponent);
         fixture.detectChanges();
 
         const progressBar = fixture.componentInstance.progressbar;
         let expectedValue = 50;
 
         fixture.componentInstance.animate = false;
+        fixture.detectChanges();
+
         fixture.componentInstance.value = expectedValue;
         fixture.detectChanges();
 
@@ -202,7 +203,12 @@ describe('IgCircularBar', () => {
     it('Value should not exceed the lower limit (0) when operating with floating numbers', fakeAsync(() => {
         const fix = TestBed.createComponent(CircularBarComponent);
         const compInstance = fix.componentInstance;
+        fix.detectChanges();
+        tick(tickTime);
+
         compInstance.max = 2.5;
+        fix.detectChanges();
+
         compInstance.value = -0.3;
         fix.detectChanges();
 
@@ -213,21 +219,24 @@ describe('IgCircularBar', () => {
         expect(bar.valueInPercent).toBe(expectedRes);
 
         compInstance.animate = false;
-        compInstance.value = -2;
+        fix.detectChanges();
 
+        compInstance.value = -2;
         fix.detectChanges();
 
         expect(bar.value).toBe(expectedRes);
         expect(bar.valueInPercent).toBe(expectedRes);
     }));
 
     it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
-        pending('Related to the bug #6740');
         const fix = TestBed.createComponent(CircularBarComponent);
         const compInstance = fix.componentInstance;
         let value = 2.67;
         const max = 2.5;
+
         compInstance.max = max;
+        fix.detectChanges();
+
         compInstance.value = value;
         fix.detectChanges();
 
@@ -238,9 +247,11 @@ describe('IgCircularBar', () => {
 
         value = 3.01;
         compInstance.animate = false;
-        compInstance.value = value;
+        fix.detectChanges();
 
+        compInstance.value = value;
         fix.detectChanges();
+
         expect(bar.value).toBe(max);
         expect(bar.valueInPercent).toBe(100);
     }));
@@ -307,7 +318,6 @@ describe('IgCircularBar', () => {
     }));
 
     it('should apply its template correctly', () => {
-        pending('Related to the bug #6740');
         const fixture = TestBed.createComponent(CircularBarTemplateComponent);
         fixture.detectChanges();
 

projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts

@@ -172,7 +172,6 @@ describe('IgLinearBar', () => {
     }));
 
     it('Should update value when we try to decrease it (without animation)', () => {
-        pending('Related to the bug #6740');
         const fixture = TestBed.createComponent(LinearBarComponent);
         const progressBar = fixture.componentInstance.progressbar;
         let expectedValue = 50;
@@ -227,32 +226,40 @@ describe('IgLinearBar', () => {
     it('Value should not exceed the lower limit (0) when operating with floating numbers', fakeAsync(() => {
         const fix = TestBed.createComponent(LinearBarComponent);
         const compInstance = fix.componentInstance;
+        fix.detectChanges();
+        tick(tickTime);
+
         compInstance.max = 2.5;
-        compInstance.value = -0.3;
         fix.detectChanges();
 
+        compInstance.value = -0.3;
+        fix.detectChanges();
         tick(tickTime);
+
         const bar = compInstance.progressbar;
         const expectedRes = 0;
         expect(bar.value).toBe(expectedRes);
         expect(bar.valueInPercent).toBe(expectedRes);
 
         compInstance.animate = false;
-        compInstance.value = -2;
+        fix.detectChanges();
 
+        compInstance.value = -2;
         fix.detectChanges();
 
         expect(bar.value).toBe(expectedRes);
         expect(bar.valueInPercent).toBe(expectedRes);
     }));
 
     it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
-        pending('Related to the bug #6740');
         const fix = TestBed.createComponent(LinearBarComponent);
         const compInstance = fix.componentInstance;
         let value = 2.67;
         const max = 2.5;
+
         compInstance.max = max;
+        fix.detectChanges();
+
         compInstance.value = value;
         fix.detectChanges();
 
@@ -263,9 +270,11 @@ describe('IgLinearBar', () => {
 
         value = 3.01;
         compInstance.animate = false;
-        compInstance.value = value;
+        fix.detectChanges();
 
+        compInstance.value = value;
         fix.detectChanges();
+
         expect(bar.value).toBe(max);
         expect(bar.valueInPercent).toBe(100);
     }));