Skip to content

Commit 8e7d0a3

Browse files
author
Hristo Popov
authored
Merge branch '9.0.x' into hPopov/refactor-grid-row-selectors-90x
2 parents 459914c + b75840f commit 8e7d0a3

File tree

5 files changed

+29
-7
lines changed

5 files changed

+29
-7
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,13 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
590590
this.notifyChanges();
591591
}
592592

593+
/**
594+
* @hidden
595+
* @internal
596+
*/
597+
@Input()
598+
public class = '';
599+
593600
/**
594601
* Gets/Sets the height.
595602
* @example
@@ -619,6 +626,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
619626
get hostWidth() {
620627
return this._width || this._hostWidth;
621628
}
629+
622630
/**
623631
* Gets/Sets the width of the grid.
624632
* @example
@@ -1856,7 +1864,10 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
18561864
*/
18571865
@HostBinding('attr.class')
18581866
get hostClass(): string {
1859-
return this.getComponentDensityClass('igx-grid');
1867+
const classes = [this.getComponentDensityClass('igx-grid')];
1868+
// The custom classes should be at the end.
1869+
classes.push(this.class);
1870+
return classes.join(' ');
18601871
}
18611872

18621873
get bannerClass(): string {

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
<ng-container *ngTemplateOutlet="template"></ng-container>
159159
<div class="igx-grid__row-editing-outlet" igxOverlayOutlet #igxRowEditingOverlayOutlet></div>
160160
</div>
161-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
162-
<igx-circular-bar [indeterminate]="true">
161+
<div #loadingOverlay>
162+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
163163
</igx-circular-bar>
164164
</div>
165165
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<igx-grid-filtering-row #filteringRow [style.width.px]='calcWidth' *ngIf="filteringService.isFilterRowVisible"
6262
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
6363
</div>
64-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
65-
<igx-circular-bar [indeterminate]="true">
64+
<div #loadingOverlay>
65+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
6666
</igx-circular-bar>
6767
</div>
6868
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ export class IgxGridToolbarComponent extends DisplayDensityBase {
6868

6969
private _filterColumnsPrompt = 'Filter columns list ...';
7070

71+
/**
72+
* @hidden
73+
* @internal
74+
*/
75+
@Input()
76+
public class = '';
77+
7178
/**
7279
* Gets the height for the `IgxGridToolbarComponent`'s drop down panels.
7380
* ```typescript
@@ -211,6 +218,10 @@ export class IgxGridToolbarComponent extends DisplayDensityBase {
211218

212219
@HostBinding('attr.class')
213220
get hostClass(): string {
221+
const classes = [this.getComponentDensityClass('igx-grid-toolbar')];
222+
// The custom classes should be at the end.
223+
classes.push(this.class);
224+
return classes.join(' ');
214225
return this.getComponentDensityClass('igx-grid-toolbar');
215226
}
216227

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
5151
</div>
5252
<div class="igx-grid__thead-thumb" [hidden]='!hasVerticalSroll()' [style.width.px]="scrollWidth"></div>
53-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
54-
<igx-circular-bar [indeterminate]="true">
53+
<div #loadingOverlay>
54+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
5555
</igx-circular-bar>
5656
</div>
5757
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

0 commit comments

Comments
 (0)