Skip to content

Commit 1262bd2

Browse files
authored
Merge pull request #9113 from IgniteUI/pbozhinov/fix-9073
Fixes isLoading on a not yet loaded row island
2 parents 2c7dfcf + 54ca42f commit 1262bd2

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,9 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
17181718
public set isLoading(value: boolean) {
17191719
if (this._isLoading !== value) {
17201720
this._isLoading = value;
1721-
this.evaluateLoadingState();
1721+
if (!!this.data) {
1722+
this.evaluateLoadingState();
1723+
}
17221724
}
17231725
Promise.resolve().then(() => {
17241726
// wait for the current detection cycle to end before triggering a new one.

src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<igx-column field="ContactTitle"></igx-column>
1414
<igx-column field="Country"></igx-column>
1515
<igx-column field="Phone"></igx-column>
16-
<igx-row-island #rowIsland1 [key]="'Orders'" [isLoading]="true" [primaryKey]="'OrderID'" [autoGenerate]="false" [rowSelection]='selectionMode' (onGridCreated)="gridCreated($event, rowIsland1)" [emptyGridMessage]="''">
16+
<igx-row-island #rowIsland1 [key]="'Orders'" [primaryKey]="'OrderID'" [autoGenerate]="false" [rowSelection]='selectionMode' (onGridCreated)="gridCreated($event, rowIsland1)" [emptyGridMessage]="''">
1717
<igx-grid-toolbar [grid]="grid" *igxGridToolbar="let grid">
1818
<igx-grid-toolbar-title>Child Toolbar - Level {{ grid.parentIsland.level }}</igx-grid-toolbar-title>
1919
<igx-grid-toolbar-actions>
@@ -25,7 +25,7 @@
2525
<igx-column field="ShipCountry"></igx-column>
2626
<igx-column field="ShipCity"></igx-column>
2727
<igx-column field="ShipAddress"></igx-column>
28-
<igx-row-island #rowIsland2 [key]="'Order_Details'" [isLoading]="true" [primaryKey]="'ProductID'" [autoGenerate]="false" [rowSelection]='selectionMode' (onGridCreated)="gridCreated($event, rowIsland2)" [emptyGridMessage]="''">
28+
<igx-row-island #rowIsland2 [key]="'Order_Details'" [primaryKey]="'ProductID'" [autoGenerate]="false" [rowSelection]='selectionMode' (onGridCreated)="gridCreated($event, rowIsland2)" [emptyGridMessage]="''">
2929
<igx-grid-toolbar [grid]="grid" *igxGridToolbar="let grid">
3030
<igx-grid-toolbar-title>Child Toolbar - Level {{ grid.parentIsland.level }}</igx-grid-toolbar-title>
3131
<igx-grid-toolbar-actions>

src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export class HierarchicalGridRemoteSampleComponent implements AfterViewInit {
7272
}
7373

7474
public gridCreated(event: IGridCreatedEventArgs, rowIsland: IgxRowIslandComponent) {
75+
event.grid.isLoading = true;
7576
this.remoteService.getData({ parentID: event.parentID, level: rowIsland.level, key: rowIsland.key }, (data) => {
7677
event.grid.data = data['value'];
7778
event.grid.isLoading = false;

0 commit comments

Comments
 (0)