Merge branch 'master' into PMiteva/input-group-reactive

Author: Lipata

CHANGELOG.md

@@ -9,6 +9,9 @@ All notable changes for each version of this project will be documented in this
     The `rowData` argument may be `undefined` in remote scenarios/applying the callback on filtering labels
     so make sure to check its availability.
 
+- `IgxExcelExporterService`
+    - Added support for freezing column headers in **Excel**. By default, the column headers would not be frozen but this behavior can be controlled by the `freezeHeaders` option of the IgxExcelExporterOptions object.
+
 ## 12.1.0
 
 ### New Features

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts

@@ -149,7 +149,7 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
             console.warn('The grid must use row edit mode to perform row adding! Please set rowEditable to true.');
             return;
         }
-        grid.beginAddRowByIndex(context.rowID, context.index, asChild, event);
+        grid.gridAPI.crudService.enterAddRowMode(context, asChild, event);
         this.strip.hide();
     }
 

projects/igniteui-angular/src/lib/checkbox/checkbox.component.ts

@@ -454,6 +454,11 @@ export class IgxCheckboxComponent implements ControlValueAccessor, EditorProvide
         this._onTouchedCallback = fn;
     }
 
+    /** @hidden @internal */
+    public setDisabledState(isDisabled: boolean) {
+        this.disabled = isDisabled;
+    }
+
     /** @hidden @internal */
     public getEditElement() {
         return this.nativeCheckbox.nativeElement;

projects/igniteui-angular/src/lib/grids/api.service.ts

@@ -8,7 +8,7 @@ import { IgxGridBaseDirective } from './grid-base.directive';
 import { IgxRowDirective } from './row.directive';
 import { IFilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
 import { Transaction, TransactionType, State } from '../services/transaction/transaction';
-import { IgxCell, IgxGridCRUDService, IgxRow } from './common/crud.service';
+import { IgxCell, IgxGridCRUDService, IgxEditRow } from './common/crud.service';
 import { GridType } from './common/grid.interface';
 import { ColumnType } from './common/column.interface';
 import { IGridEditEventArgs, IRowToggleEventArgs } from './common/events';
@@ -122,23 +122,6 @@ export class GridBaseAPIService<T extends IgxGridBaseDirective & GridType> {
         }
     }
 
-    public update_add_cell(cell: IgxCell): IGridEditEventArgs  {
-        if (!cell) {
-            return;
-        }
-
-        const args = cell.createEditEventArgs(true);
-
-        const data = cell.rowData;
-        if (cell.column.hasNestedPath) {
-            mergeObjects(data, reverseMapper(cell.column.field, args.newValue));
-        } else {
-            data[cell.column.field] = args.newValue;
-        }
-        mergeObjects(this.crudService.row.data, data);
-        return args;
-    }
-
     public update_cell(cell: IgxCell): IGridEditEventArgs {
         if (!cell) {
             return;
@@ -167,7 +150,7 @@ export class GridBaseAPIService<T extends IgxGridBaseDirective & GridType> {
     }
 
     // TODO: CRUD refactor to not emit editing evts.
-    public update_row(row: IgxRow, value: any, event?: Event) {
+    public update_row(row: IgxEditRow, value: any, event?: Event) {
         const grid = this.grid;
         const selected = grid.selectionService.isRowSelected(row.id);
         const rowInEditMode = this.crudService.row;
@@ -270,10 +253,11 @@ export class GridBaseAPIService<T extends IgxGridBaseDirective & GridType> {
         return this.grid.filteredData;
     }
 
-    public addRowToData(rowData: any, _parentRowID?) {
+    public addRowToData(rowData: any, parentID?) {
         // Add row goes to transactions and if rowEditable is properly implemented, added rows will go to pending transactions
         // If there is a row in edit - > commit and close
         const grid = this.grid;
+
         if (grid.transactions.enabled) {
             const transactionId = grid.primaryKey ? rowData[grid.primaryKey] : rowData;
             const transaction: Transaction = { id: transactionId, type: TransactionType.ADD, newValue: rowData };

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

@@ -58,7 +58,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
      */
     @HostBinding('class.igx-grid__td--new')
     public get isEmptyAddRowCell() {
-        return this.intRow.addRow && (this.value === undefined || this.value === null);
+        return this.intRow.addRowUI && (this.value === undefined || this.value === null);
     }
 
     /**
@@ -195,7 +195,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         if (this.cellTemplate) {
             return this.cellTemplate;
         }
-        if (this.grid.rowEditable && this.intRow.addRow) {
+        if (this.grid.rowEditable && this.intRow.addRowUI) {
             return this.addRowCellTemplate;
         }
         return this.defaultCellTemplate;
@@ -984,11 +984,8 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
 
         if (this.editable && editMode && !this.intRow.deleted) {
             if (editableCell) {
-                if (this.intRow.addRow) {
-                    editableArgs = this.grid.crudService.updateAddCell(false, event);
-                } else {
-                    editableArgs = this.grid.crudService.updateCell(false, event);
-                }
+                editableArgs = this.grid.crudService.updateCell(false, event);
+
                 /* This check is related with the following issue #6517:
                  * when edit cell that belongs to a column which is sorted and press tab,
                  * the next cell in edit mode is with wrong value /its context is not updated/;
@@ -1013,16 +1010,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         }
 
         if (editableCell && crud.sameRow(this.cellID.rowID)) {
-            if (this.intRow.addRow) {
-                const args = this.grid.crudService.updateAddCell(false, event);
-                if (args.cancel) {
-                    this.grid.crudService.endAddRow();
-                } else {
-                    this.grid.crudService.exitCellEdit(event);
-                }
-            } else {
-                this.grid.crudService.updateCell(true, event);
-            }
+            this.grid.crudService.updateCell(true, event);
         } else if (editMode && !crud.sameRow(this.cellID.rowID)) {
             this.grid.crudService.endEdit(true, event);
         }