Skip to content

Commit 6755c04

Browse files
committed
Merge branch 'mdragnev/add-row-feat' of https://github.com/IgniteUI/igniteui-angular into mdragnev/add-row-transactions
2 parents 0dea46d + ead3eae commit 6755c04

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
[column]="this.column.field"
5656
[containerClass]="'igx-grid__td-text'"
5757
[metadata]="searchMetadata">{{
58-
value ? value : column.header
58+
value ? value : column.field
5959
}}</div>
6060
</ng-template>
6161
<ng-template #inlineEditor let-cell="cell">

projects/igniteui-angular/src/lib/grids/common/column.interface.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,5 @@ export interface ColumnType {
4343
topLevelParent?: ColumnType;
4444
parent?: ColumnType;
4545
hasLastPinnedChildColumn: boolean;
46-
header: string;
4746
getGridTemplate(isRow: boolean, isIE: boolean): string;
4847
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3263,7 +3263,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
32633263
});
32643264

32653265
this.addRowSnackbar?.onAction.subscribe(() => {
3266-
this.navigateTo(this.lastAddedRowId);
3266+
this.navigateTo(this.lastAddedRowId, 0);
32673267
this.addRowSnackbar.hide();
32683268
});
32693269
}

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,13 @@ export class IgxGridNavigationService {
284284
event.preventDefault();
285285
if ((this.grid.rowInEditMode && this.grid.rowEditTabs.length) &&
286286
(this.activeNode.row !== next.rowIndex || this.isActiveNode(next.rowIndex, next.visibleColumnIndex))) {
287-
this.grid.gridAPI.submit_value();
287+
if (this.grid.crudService.row?.isAddRow) {
288+
this.grid.gridAPI.submit_add_value();
289+
const row = this.grid.rowList.find(r => r.rowID === this.grid.crudService.row.id);
290+
row.rowData = this.grid.crudService.row.data;
291+
} else {
292+
this.grid.gridAPI.submit_value();
293+
}
288294
shift ? this.grid.rowEditTabs.last.element.nativeElement.focus() :
289295
this.grid.rowEditTabs.first.element.nativeElement.focus();
290296
return;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
[ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
163163
[ngStyle]="col.cellStyles | igxCellStyles:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
164164
[editMode]="col.editable && crudService.isInEditMode(index, col.index)"
165+
[addMode]="col.editable && crudService.isInAddMode(index,col.index)"
165166
[column]="col"
166167
[style.-ms-grid-row-span]="col.gridRowSpan"
167168
[style.-ms-grid-column-span]="col.gridColumnSpan"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@
230230
</ng-template>
231231
</div>
232232
<div class="igx-grid__scroll-end" [style.float]='"right"' [style.width.px]='pinnedWidth' [style.min-width.px]='pinnedWidth' [hidden]="pinnedWidth === 0 || isPinningToStart"></div>
233-
<div class="igx-grid__grid-addrow-snackbar">
234-
<igx-snackbar #addRowSnackbar [actionText]="snackbarActionText" displayTime='2000'>{{snackbarLabel}}</igx-snackbar>
235-
</div>
233+
</div>
234+
<div class="igx-grid__grid-addrow-snackbar">
235+
<igx-snackbar #addRowSnackbar [actionText]="snackbarActionText" displayTime='2000'>{{snackbarLabel}}</igx-snackbar>
236236
</div>
237237

238238
<div class="igx-grid__footer" #footer>

0 commit comments

Comments
 (0)