Skip to content

Commit 641f0da

Browse files
authored
Merge branch 'master' into ddincheva/rowStyling
2 parents aae22cd + c87093f commit 641f0da

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

ROADMAP.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
1. Add row at top of grid [#9675](https://github.com/IgniteUI/igniteui-angular/issues/9675)
88
2. Grid row styles and classes [#9969](https://github.com/IgniteUI/igniteui-angular/issues/9969)
99
3. Freezing Columns/Rows on Export to Excel (Angular) [#9863](https://github.com/IgniteUI/igniteui-angular/issues/9863)
10-
4. Stepper component [#8667](https://github.com/IgniteUI/igniteui-angular/issues/8667)
10+
4. Persistent State directive for column group [#8516](https://github.com/IgniteUI/igniteui-angular/issues/8516)
1111
5. IgxTreeGrid: display only filtered records [#9923](https://github.com/IgniteUI/igniteui-angular/issues/9923)
1212

1313
## Going down the road
@@ -17,6 +17,7 @@
1717
3. PDF Export feature on Angular Grid [#5696](https://github.com/IgniteUI/igniteui-angular/issues/5696)
1818
4. Themes: Move code to Sass modules [#9554](https://github.com/IgniteUI/igniteui-angular/issues/9554)
1919
5. Themes: Split themes and aid with Grid refactoring [#9556](https://github.com/IgniteUI/igniteui-angular/issues/9556)
20+
6. Stepper component [#8667](https://github.com/IgniteUI/igniteui-angular/issues/8667)
2021

2122
# Previous Milestone
2223

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3026,7 +3026,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
30263026
};
30273027

30283028
private transactionChange$ = new Subject<void>();
3029-
3029+
private _rendered = false;
30303030
private readonly DRAG_SCROLL_DELTA = 10;
30313031

30323032
/**
@@ -3711,6 +3711,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
37113711
this.paginator.totalRecords = this.totalRecords;
37123712
this.paginator.overlaySettings = { outlet: this.outlet };
37133713
}
3714+
this._rendered = true;
37143715
});
37153716
Promise.resolve().then(() => this.rendered.next(true));
37163717
}
@@ -4065,16 +4066,24 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
40654066
return this.featureColumnsWidth();
40664067
}
40674068

4069+
/**
4070+
* @hidden
4071+
* @internal
4072+
*/
4073+
public get columns(): IgxColumnComponent[] {
4074+
return this._columns;
4075+
}
4076+
40684077
/**
40694078
* Gets an array of `IgxColumnComponent`s.
40704079
*
40714080
* @example
40724081
* ```typescript
4073-
* const colums = this.grid.columns.
4082+
* const colums = this.grid.columnsCollection.
40744083
* ```
40754084
*/
4076-
public get columns(): IgxColumnComponent[] {
4077-
return this._columns;
4085+
public get columnsCollection(): IgxColumnComponent[] {
4086+
return this._rendered ? this._columns : [];
40784087
}
40794088

40804089
/**

0 commit comments

Comments
 (0)