Skip to content

fix(igxGrid): Minor fix and refactor for row adding APIs. #11279

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 2 commits into from
Mar 25, 2022
Merged

fix(igxGrid): Minor fix and refactor for row adding APIs. #11279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4469e22
fix(igxGrid): Minor fix and refactor for row adding APIs.
Mar 24, 2022
5de9152
chore(*): Fix test as it seems that when null is passed adding UI sho…
Mar 25, 2022
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
16 changes: 10 additions & 6 deletions projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5964,18 +5964,22 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
console.warn('The record cannot be added as a child to an unspecified record.');
return;
}
index = 0;
index = null;
} else {
// find the index of the record with that PK
index = this.gridAPI.get_rec_index_by_id(rowID, this.dataView);
rowID = index;
if (index === -1) {
console.warn('No row with the specified ID was found.');
return;
}
}

this._addRowForIndex(index, asChild);
}

protected _addRowForIndex(index: number, asChild?: boolean) {
if (!this.dataView.length) {
this.beginAddRowForIndex(rowID, asChild);
this.beginAddRowForIndex(index, asChild);
return;
}
// check if the index is valid - won't support anything outside the data view
Expand All @@ -5987,13 +5991,13 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
this.verticalScrollContainer.chunkLoad
.pipe(first(), takeUntil(this.destroy$))
.subscribe(() => {
this.beginAddRowForIndex(rowID, asChild);
this.beginAddRowForIndex(index, asChild);
});
this.navigateTo(index);
this.notifyChanges(true);
return;
}
this.beginAddRowForIndex(rowID, asChild);
this.beginAddRowForIndex(index, asChild);
} else {
console.warn('The row with the specified PK or index is outside of the current data view.');
}
Expand All @@ -6014,7 +6018,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
if (index === 0) {
return this.beginAddRowById(null);
}
return this.beginAddRowById(this.gridAPI.get_rec_id_by_index(index - 1, this.dataView));
return this._addRowForIndex(index - 1);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
if (index === null || index < 0) {
return this.beginAddRowById(null, asChild);
}
return this.beginAddRowById(this.gridAPI.get_rec_id_by_index(index, this.dataView), asChild);
return this._addRowForIndex(index - 1, asChild);
}

/**
Expand Down