Skip to content

Commit 5633ac5

Browse files
authored
Merge branch '9.0.x' into mkirova/fix-6701-9.0.x
2 parents 0fb250b + 48967e2 commit 5633ac5

File tree

6 files changed

+375
-559
lines changed

6 files changed

+375
-559
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ $_bootstrap-toast: extend(
5656
(
5757
variant: 'bootstrap',
5858
background: #fff,
59+
60+
text-color: (
61+
igx-color: ('grays', 600)
62+
)
5963
)
6064
);
6165

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2430,6 +2430,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
24302430
private _unpinnedWidth = NaN;
24312431
private _visibleColumns = [];
24322432
private _columnGroups = false;
2433+
private _autoGeneratedCols = [];
24332434
protected _headerFeaturesWidth = NaN;
24342435

24352436
private _columnWidth: string;
@@ -4498,6 +4499,12 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
44984499
*/
44994500
protected onColumnsChanged(change: QueryList<IgxColumnComponent>) {
45004501
const diff = this.columnListDiffer.diff(change);
4502+
if (this.autoGenerate && this.columnList.length === 0 && this._autoGeneratedCols.length > 0) {
4503+
// In Ivy if there are nested conditional templates the content children are re-evaluated
4504+
// hence autogenerated columns are cleared and need to be reset.
4505+
this.columnList.reset(this._autoGeneratedCols);
4506+
return;
4507+
}
45014508
if (diff) {
45024509
let added = false;
45034510
let removed = false;
@@ -4721,6 +4728,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
47214728
ref.changeDetectorRef.detectChanges();
47224729
columns.push(ref.instance);
47234730
});
4731+
this._autoGeneratedCols = columns;
47244732

47254733
this.columnList.reset(columns);
47264734
if (data && data.length > 0) {

0 commit comments

Comments
 (0)