Skip to content

Commit 2548f43

Browse files
authored
Merge pull request #6950 from IgniteUI/mkirova/fix-6934
fix(igxGrid): Render loading indicator only when needed.
2 parents d90a302 + 8679231 commit 2548f43

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
<ng-container *ngTemplateOutlet="template"></ng-container>
191191
<div class="igx-grid__row-editing-outlet" igxOverlayOutlet #igxRowEditingOverlayOutlet></div>
192192
</div>
193-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
194-
<igx-circular-bar [indeterminate]="true">
193+
<div #loadingOverlay>
194+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
195195
</igx-circular-bar>
196196
</div>
197197
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
<igx-grid-filtering-row #filteringRow [style.width.px]='calcWidth' *ngIf="filteringService.isFilterRowVisible"
7373
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
7474
</div>
75-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
76-
<igx-circular-bar [indeterminate]="true">
75+
<div #loadingOverlay>
76+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
7777
</igx-circular-bar>
7878
</div>
7979
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
5757
</div>
5858
<div class="igx-grid__thead-thumb" [hidden]='!hasVerticalSroll()' [style.width.px]="scrollWidth"></div>
59-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
60-
<igx-circular-bar [indeterminate]="true">
59+
<div #loadingOverlay>
60+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
6161
</igx-circular-bar>
6262
</div>
6363
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

0 commit comments

Comments
 (0)