Skip to content

fix(igxHierarchicalGrid): Error is thrown on child grid initializatio… #5835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2019
Merged

fix(igxHierarchicalGrid): Error is thrown on child grid initializatio… #5835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd3264d
fix(igxHierarchicalGrid): Error is thrown on child grid initializatio…
Sep 19, 2019
0b4469f
chore(*): Adding test.
Sep 24, 2019
8e52b48
Merge branch '8.1.x' into mkirova/fix-5683-8.1.x
mpavlinov Oct 1, 2019
71caf92
Merge branch '8.1.x' into mkirova/fix-5683-8.1.x
zdrawku Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,19 @@ describe('IgxForOf directive -', () => {
}
});

it('should not throw error when itemSize is changed while data is null/undefined.', () => {
let errorMessage = '';
fix.componentInstance.data = null;
fix.detectChanges();
try {
fix.componentInstance.itemSize = '100px';
fix.detectChanges();
} catch (ex) {
errorMessage = ex.message;
}
expect(errorMessage).toBe('');
});

it('should allow initially undefined value for igxForOf and then detect changes correctly once the value is updated', async () => {
fix = TestBed.createComponent(VerticalVirtualNoDataComponent);
expect(() => {
Expand Down
6 changes: 4 additions & 2 deletions projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,8 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
}
}
const defaultItemSize = 'igxForItemSize';
if (defaultItemSize in changes && !changes[defaultItemSize].firstChange && this.igxForScrollOrientation === 'vertical') {
if (defaultItemSize in changes && !changes[defaultItemSize].firstChange &&
this.igxForScrollOrientation === 'vertical' && this.igxForOf) {
// handle default item size changed.
this.initSizesCache(this.igxForOf);
this._applyChanges();
Expand Down Expand Up @@ -1325,7 +1326,8 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
}
}
const defaultItemSize = 'igxForItemSize';
if (defaultItemSize in changes && !changes[defaultItemSize].firstChange && this.igxForScrollOrientation === 'vertical') {
if (defaultItemSize in changes && !changes[defaultItemSize].firstChange &&
this.igxForScrollOrientation === 'vertical' && this.igxForOf) {
// handle default item size changed.
this.initSizesCache(this.igxForOf);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button (click)='setterBindingChange()'>Set rowSelectable via binding</button>
<button (click)='setterChange()'>Set rowSelectable via setter on 1st row island</button>
<igx-hierarchical-grid #grid1 [data]="remoteData" [primaryKey]="'CustomerID'" [autoGenerate]="false" [height]="'800px'" [width]="'100%'" #hGrid [emptyGridMessage]="''">
<igx-hierarchical-grid #grid1 displayDensity="cosy" [data]="remoteData" [primaryKey]="'CustomerID'" [autoGenerate]="false" [height]="'800px'" [width]="'100%'" #hGrid [emptyGridMessage]="''">
<igx-column field="CustomerID"></igx-column>
<igx-column field="CompanyName"></igx-column>
<igx-column field="ContactName"></igx-column>
Expand Down