@syncfusion/ej2-grids - npm Package Compare versions

Comparing version 16.1.48 to 16.2.41

CHANGELOG.md

@@ -9,17 +9,15 @@ # Changelog
 
-- Dropdown Editing issue fixed when grid is resides in Dialog
-- Complex object properties missed while batch editing issue fixed.
-- Refreshing grid in edit state while using frozen rows and columns is fixed
-- Sorting in disable state while set dynamic sort settings with descending order issue fixed  
+- Group footer template shows incorrect value while using `disablePageWiseAggregate` issue fixed.
+- Unable to sort when set dynamic sort settings in descending order resolved.
+- Footer aggregate row is not aligned properly when using child grid resolved.
+- In batch editing, script error occurs when focusing on grid after clicking add and cancel button fixed.
+- Filter icon misalignment with text wrap enabled resolved.
+- Selection retained after unchecking the check all checkbox with remote data source fixed.
+- `actionComplete` event is not triggered for batch cancel resolved.
+- Frozen content got hidden while adding new row with auto height is resolved.
+- Unable to use auto complete inside filter bar template resolved.
+- Aggregates row get misaligned while horizontal scrolling if vertical scrollbar presents resolved.
+- Excel filter dialog is not updated when properties updated through `setProperties` issue resolved.
+- Indent column disappeared when resizing the hierarchy column in Grid issue fixed.
 
-
-## 16.1.47 (2018-06-06)
-
-### Grid
-
-#### Bug Fixes
-
-- Memory leak issue with angular routing fixed.
-- Sort icon misalignment with auto wrap feature.
-
 ## 16.1.44 (2018-05-18)
@@ -26,0 +24,0 @@

dist/global/index.d.ts

@@ -1,10 +0,1 @@
-/*!
-*  filename: index.d.ts
-*  version : 16.1.48
-*  Copyright Syncfusion Inc. 2001 - 2018. All rights reserved.
-*  Use of this code is subject to the terms of our license.
-*  A copy of the current license can be obtained at any time by e-mailing
-*  [e-mail]. Any infringement will be prosecuted under
-*  applicable laws. 
-*/
 import * as _grids from '@syncfusion/ej2-grids';
@@ -24,2 +15,3 @@ import * as _base from '@syncfusion/ej2-base';
 import * as _compression from '@syncfusion/ej2-compression';
+import * as _splitbuttons from '@syncfusion/ej2-splitbuttons';
 
@@ -41,2 +33,3 @@ export declare namespace ej {
     const compression: typeof _compression;
+    const splitbuttons: typeof _splitbuttons;
 }

package.json

 {
   "name": "@syncfusion/ej2-grids",
-  "version": "16.1.48",
+  "version": "16.2.41",
   "description": "Essential JS 2 Grid Component",
@@ -11,15 +11,16 @@ "author": "Syncfusion Inc.",
   "dependencies": {
-    "@syncfusion/ej2-base": "~16.1.38",
-    "@syncfusion/ej2-data": "~16.1.42",
-    "@syncfusion/ej2-navigations": "~16.1.42",
-    "@syncfusion/ej2-inputs": "~16.1.45",
-    "@syncfusion/ej2-calendars": "~16.1.48",
-    "@syncfusion/ej2-dropdowns": "~16.1.46",
-    "@syncfusion/ej2-popups": "~16.1.47",
-    "@syncfusion/ej2-buttons": "~16.1.48",
-    "@syncfusion/ej2-lists": "~16.1.42",
-    "@syncfusion/ej2-excel-export": "~16.1.37",
-    "@syncfusion/ej2-pdf-export": "~16.1.37",
-    "@syncfusion/ej2-file-utils": "~16.1.37",
-    "@syncfusion/ej2-compression": "~16.1.37"
+    "@syncfusion/ej2-base": "~16.2.41",
+    "@syncfusion/ej2-data": "~16.2.41",
+    "@syncfusion/ej2-navigations": "~16.2.41",
+    "@syncfusion/ej2-inputs": "~16.2.41",
+    "@syncfusion/ej2-calendars": "~16.2.41",
+    "@syncfusion/ej2-dropdowns": "~16.2.41",
+    "@syncfusion/ej2-popups": "~16.2.41",
+    "@syncfusion/ej2-buttons": "~16.2.41",
+    "@syncfusion/ej2-lists": "~16.2.41",
+    "@syncfusion/ej2-excel-export": "~16.2.41",
+    "@syncfusion/ej2-pdf-export": "~16.2.41",
+    "@syncfusion/ej2-file-utils": "~16.2.41",
+    "@syncfusion/ej2-compression": "~16.2.41",
+    "@syncfusion/ej2-splitbuttons": "~16.2.41"
   },
@@ -26,0 +27,0 @@ "devDependencies": {

ReadMe.md

@@ -42,3 +42,3 @@ # ej2-grids
 * [**Sorting and grouping**](https://ej2.syncfusion.com/demos/?utm_source=npm&utm_campaign=grid#/material/grid/grouping.html) - Supports n levels of sorting and grouping.
-* [**Filtering**](https://ej2.syncfusion.com/demos/?utm_source=npm&utm_campaign=grid#/material/grid/filter.html) - Offers filter bar at each column to filter data.
+* [**Filtering**](https://ej2.syncfusion.com/demos/?utm_source=npm&utm_campaign=grid#/material/grid/filter.html) - Offers filter UI such as filter bar, menu, excel and checkbox at each column to filter data.
 * [**Paging**](https://ej2.syncfusion.com/demos/?utm_source=npm&utm_campaign=grid#/material/grid/defaultpaging.html) - Provides the option to easily switch between pages using the pager bar.
@@ -45,0 +45,0 @@ * [**Editing**](https://ej2.syncfusion.com/demos/?utm_source=npm&utm_campaign=grid#/material/grid/normal-editing.html) - provides the options for create, read, update, and delete operations.

src/components.d.ts

 /**
- * Export Grid and Pager
+ * Export Export Grid and Pager
  */
 export * from './grid/base/grid';
 export * from './pager/pager';

src/grid/actions/batch-edit.js

@@ -1,2 +0,2 @@
-define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/enum", "../base/util", "../base/constant", "../renderer/row-renderer", "../renderer/cell-renderer", "../models/cell", "../services/row-model-generator"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, enum_1, util_1, events, row_renderer_1, cell_renderer_1, cell_1, row_model_generator_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/enum", "../base/util", "../base/constant", "../renderer/row-renderer", "../renderer/cell-renderer", "../models/row", "../models/cell", "../services/row-model-generator"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, enum_1, util_1, events, row_renderer_1, cell_renderer_1, row_1, cell_1, row_model_generator_1) {
     "use strict";
@@ -179,2 +179,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
             gObj.notify(events.batchCancel, { rows: this.parent.getRowsObject() });
+            var args = {
+                requestType: 'batchCancel', type: 'actionBegin', cancel: false
+            };
+            gObj.trigger(events.actionBegin, args);
+            if (args.cancel) {
+                return;
+            }
+            gObj.notify(events.batchCancel, {
+                rows: this.parent.getRowsObject().length ? this.parent.getRowsObject() :
+                    [new row_1.Row({ isDataRow: true, cells: [new cell_1.Cell({ isDataCell: true, visible: true })] })]
+            });
             gObj.selectRow(this.cellDetails.rowIndex);
@@ -184,2 +195,4 @@ this.refreshRowIdx();
             this.parent.notify(events.tooltipDestroy, {});
+            args = { requestType: 'batchCancel', type: 'actionComplete' };
+            gObj.trigger(events.actionComplete, args);
         };
@@ -410,2 +423,5 @@ BatchEdit.prototype.deleteRecord = function (fieldname, data) {
                 ej2_base_1.addClass(mTr.querySelectorAll('.e-rowcell'), ['e-updatedtd']);
+                if (this.parent.height === 'auto') {
+                    this.parent.notify(events.frozenHeight, {});
+                }
             }
@@ -505,2 +521,3 @@ if (gObj.frozenRows) {
                 var rowData = void 0;
+                var mRowData = void 0;
                 var colIdx = gObj.getColumnIndexByField(field);
@@ -510,3 +527,3 @@ var frzCols = gObj.getFrozenColumns();
                     row = gObj.getMovableDataRows()[index];
-                    var mRowData = this.parent.getRowObjectFromUID(this.parent.getMovableRows()[index].getAttribute('data-uid'));
+                    mRowData = this.parent.getRowObjectFromUID(this.parent.getMovableDataRows()[index].getAttribute('data-uid'));
                     rowData = mRowData.changes ? ej2_base_1.extend({}, mRowData.changes) : ej2_base_1.extend({}, this.getDataByIndex(index));
@@ -604,4 +621,4 @@ }
             var cell = new cell_renderer_1.CellRenderer(this.parent, this.serviceLocator);
+            var rowcell;
             this.setChanges(rowObj, column.field, value);
-            var rowcell;
             var frzCols = this.parent.getFrozenColumns();
@@ -608,0 +625,0 @@ util_1.refreshForeignData(rowObj, this.parent.getForeignKeyColumns(), rowObj.changes);

src/grid/actions/checkbox-filter.d.ts

 import { L10n } from '@syncfusion/ej2-base';
-import { Predicate } from '@syncfusion/ej2-data';
+import { Query, Predicate } from '@syncfusion/ej2-data';
 import { FilterSettings } from '../base/grid';
@@ -82,2 +82,5 @@ import { IGrid, IFilterArgs } from '../base/interface';
     private getAllData();
+    private filterEvent(args, query);
+    private eventPromise(args, query);
+    getStateEventArgument(query: Query): Object;
     private processDataOperation(query);
@@ -84,0 +87,0 @@ private dataSuccess(e);

src/grid/actions/checkbox-filter.js

@@ -145,4 +145,6 @@ define(["require", "exports", "@syncfusion/ej2-base", "../base/util", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "@syncfusion/ej2-buttons", "../base/constant", "../services/value-formatter", "../base/util", "@syncfusion/ej2-popups", "@syncfusion/ej2-inputs", "@syncfusion/ej2-popups", "../base/util"], function (require, exports, ej2_base_1, util_1, ej2_base_2, ej2_data_1, ej2_buttons_1, events, value_formatter_1, util_2, ej2_popups_1, ej2_inputs_1, ej2_popups_2, util_3) {
                         click: this.btnClick.bind(this),
-                        buttonModel: { content: this.getLocalizedLabel(this.isExcel ? 'OKButton' : 'FilterButton'),
-                            cssClass: 'e-primary', isPrimary: true }
+                        buttonModel: {
+                            content: this.getLocalizedLabel(this.isExcel ? 'OKButton' : 'FilterButton'),
+                            cssClass: 'e-primary', isPrimary: true
+                        }
                     },
@@ -290,2 +292,4 @@ {
                 }
+                parsed = parsed === 'true';
+                operator = 'equal';
             }
@@ -316,3 +320,8 @@ var args = {
             query.take(args.filterChoiceCount);
-            this.processSearch(query);
+            if (this.parent.dataSource && 'result' in this.parent.dataSource) {
+                this.filterEvent(args, query);
+            }
+            else {
+                this.processSearch(query);
+            }
         };
@@ -350,4 +359,34 @@ CheckBoxFilter.prototype.getPredicateFromCols = function (columns) {
             query.take(args.filterChoiceCount);
-            this.processDataOperation(query);
+            if (this.parent.dataSource && 'result' in this.parent.dataSource) {
+                this.filterEvent(args, query);
+            }
+            else {
+                this.processDataOperation(query);
+            }
         };
+        CheckBoxFilter.prototype.filterEvent = function (args, query) {
+            var _this = this;
+            var def = this.eventPromise(args, query);
+            def.promise.then(function (e) {
+                _this.dataSuccess(e);
+            });
+        };
+        CheckBoxFilter.prototype.eventPromise = function (args, query) {
+            var state;
+            state = this.getStateEventArgument(query);
+            var def = new ej2_data_1.Deferred();
+            state.dataSource = def.resolve;
+            state.action = args;
+            this.parent.trigger(events.dataStateChange, state);
+            return def;
+        };
+        ;
+        CheckBoxFilter.prototype.getStateEventArgument = function (query) {
+            var adaptr = new ej2_data_1.UrlAdaptor();
+            var dm = new ej2_data_1.DataManager({ url: '', adaptor: new ej2_data_1.UrlAdaptor });
+            var state = adaptr.processQuery(dm, query);
+            var data = JSON.parse(state.data);
+            return data;
+        };
+        ;
         CheckBoxFilter.prototype.processDataOperation = function (query) {
@@ -393,3 +432,3 @@ var _this = this;
             this.processDataSource(null, true, this.filteredData);
-            this.dialogObj.element.querySelector('.e-searchinput').focus();
+            this.sInput.focus();
             var args = {
@@ -472,3 +511,3 @@ requestType: events.filterAfterOpen,
             var selected = this.cBox.querySelectorAll('.e-check:not(.e-selectall)').length;
-            var btn = this.dlg.querySelector('.e-footer-content').querySelector('.e-btn').ej2_instances[0];
+            var btn = this.dialogObj.btnObj[0];
             btn.disabled = false;
@@ -492,3 +531,3 @@ if (cnt === selected) {
             var cBoxes = ej2_base_2.createElement('div');
-            var btn = this.dlg.querySelector('.e-footer-content').querySelector('.e-btn').ej2_instances[0];
+            var btn = this.dialogObj.btnObj[0];
             this.itemsCnt = data.length;
@@ -495,0 +534,0 @@ if (data.length) {

src/grid/actions/column-chooser.d.ts

@@ -78,2 +78,3 @@ import { ServiceLocator } from '../services/service-locator';
     private checkBoxClickHandler(e);
+    private refreshCheckboxButton();
     private refreshCheckboxList(gdCol, searchVal?);
@@ -80,0 +81,0 @@ private refreshCheckboxState();

src/grid/actions/column-chooser.js

@@ -90,2 +90,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "@syncfusion/ej2-base", "../base/constant", "@syncfusion/ej2-popups", "../base/util", "@syncfusion/ej2-buttons", "../services/focus-strategy"], function (require, exports, ej2_base_1, ej2_data_1, ej2_base_2, events, ej2_popups_1, util_1, ej2_buttons_1, focus_strategy_1) {
                         this.dlgObj.hide();
+                        this.clearActions();
                         this.refreshCheckboxState();
@@ -96,2 +97,3 @@ this.isDlgOpen = false;
             }
+            this.rtlUpdate();
         };
@@ -148,2 +150,3 @@ ColumnChooser.prototype.hideDialog = function () {
             }
+            this.rtlUpdate();
         };
@@ -193,4 +196,4 @@ ColumnChooser.prototype.openColumnChooser = function (X, Y) {
         ColumnChooser.prototype.getColumns = function () {
-            var columns = this.parent.getColumns().filter(function (column) { return column.type !== 'checkbox'
-                || column.type === 'checkbox' && column.field !== undefined; });
+            var columns = this.parent.getColumns().filter(function (column) { return (column.type !== 'checkbox'
+                && column.showInColumnChooser === true) || (column.type === 'checkbox' && column.field !== undefined); });
             return columns;
@@ -371,4 +374,15 @@ };
                 this.checkstatecolumn(checkstate, columnUid);
+                this.refreshCheckboxButton();
             }
         };
+        ColumnChooser.prototype.refreshCheckboxButton = function () {
+            var searchValue = this.dlgObj.element.querySelector('.e-cc.e-input').value;
+            var selected = this.innerDiv.querySelectorAll('.e-check').length;
+            var btn = this.dlgDiv.querySelector('.e-footer-content').querySelector('.e-btn').ej2_instances[0];
+            btn.disabled = false;
+            if (selected === 0 && searchValue === '') {
+                btn.disabled = true;
+            }
+            btn.dataBind();
+        };
         ColumnChooser.prototype.refreshCheckboxList = function (gdCol, searchVal) {
@@ -375,0 +389,0 @@ this.ulElement = ej2_base_1.createElement('ul', { className: 'e-ccul-ele e-cc' });

src/grid/actions/column-menu.js

@@ -175,2 +175,4 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-navigations", "../base/util", "../base/constant", "@syncfusion/ej2-popups", "@syncfusion/ej2-buttons", "../actions/group", "../actions/sort", "../actions/filter", "../actions/resize"], function (require, exports, ej2_base_1, ej2_base_2, ej2_navigations_1, util_1, events, ej2_popups_1, ej2_buttons_1, group_1, sort_1, filter_1, resize_1) {
             else if (args.event && (ej2_base_1.closest(args.event.target, '.' + this.POP)
+                || (args.event.currentTarget && args.event.currentTarget.activeElement &&
+                    util_1.parentsUntil(args.event.currentTarget.activeElement, 'e-filter-popup'))
                 || util_1.parentsUntil(args.event.target, 'e-popup') ||
@@ -177,0 +179,0 @@ (util_1.parentsUntil(args.event.target, 'e-popup-wrapper')))) {

src/grid/actions/context-menu.js

@@ -155,3 +155,8 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-navigations", "../base/constant", "../actions/resize", "../actions/page", "../base/util", "../actions/group", "../actions/sort", "../actions/pdf-export", "../actions/excel-export"], function (require, exports, ej2_base_1, ej2_base_2, ej2_navigations_1, events, resize_1, page_1, util_1, group_1, sort_1, pdf_export_1, excel_export_1) {
                     }
-                    this.parent.editModule.deleteRow(this.row);
+                    if (this.parent.getSelectedRecords().length === 1) {
+                        this.parent.editModule.deleteRow(this.row);
+                    }
+                    else {
+                        this.parent.deleteRecord();
+                    }
                     break;
@@ -501,3 +506,3 @@ case 'Save':
             this.row = ej2_base_1.closest(e.target, 'tr.e-row') || this.row;
-            if (this.row && isSelectable) {
+            if (this.row && isSelectable && !util_1.parentsUntil(e.target, 'e-gridpager')) {
                 this.parent.selectRow(parseInt(this.row.getAttribute('aria-rowindex'), 10));
@@ -504,0 +509,0 @@ }

src/grid/actions/data.js

@@ -88,4 +88,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../base/util", "../base/constant", "../services/value-formatter", "../actions/checkbox-filter"], function (require, exports, ej2_base_1, ej2_data_1, util_1, events, value_formatter_1, checkbox_filter_1) {
                     }
-                    var fn = col.sortComparer && !this.isRemote() ? col.sortComparer.bind(col) :
-                        columns[i].direction;
+                    var fn = col.sortComparer && !this.isRemote() ? col.sortComparer.bind(col) : columns[i].direction;
                     if (gObj.groupSettings.columns.indexOf(columns[i].field) === -1) {
@@ -222,3 +221,15 @@ query.sortBy(col.field, fn);
                         query = query ? query : this.generateQuery();
-                        crud = this.dataManager.remove(key, args.data[0], null, query);
+                        var len = Object.keys(args.data).length;
+                        if (len === 1) {
+                            crud = this.dataManager.remove(key, args.data[0], null, query);
+                        }
+                        else {
+                            var changes = {
+                                addedRecords: [],
+                                deletedRecords: [],
+                                changedRecords: []
+                            };
+                            changes.deletedRecords = args.data;
+                            crud = this.dataManager.saveChanges(changes, key, null, query.requiresCount());
+                        }
                         break;
@@ -231,3 +242,3 @@ case 'save':
                 }
-                if (crud && !Array.isArray(crud)) {
+                if (crud && !Array.isArray(crud) && !crud.hasOwnProperty('deletedRecords')) {
                     return crud.then(function (result) {
@@ -359,4 +370,3 @@ return _this.executeQuery(query);
             var data = JSON.parse(state.data);
-            var final = Object.assign(data, state.pvtData);
-            return final;
+            return ej2_base_1.extend(data, state.pvtData);
         };
@@ -363,0 +373,0 @@ Data.prototype.eventPromise = function (args, query, key) {

src/grid/actions/edit.js

@@ -136,3 +136,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/constant", "../renderer/edit-renderer", "../renderer/boolean-edit-cell", "../renderer/dropdown-edit-cell", "../renderer/numeric-edit-cell", "../renderer/default-edit-cell", "./inline-edit", "./batch-edit", "./dialog-edit", "@syncfusion/ej2-popups", "../base/util", "@syncfusion/ej2-inputs", "../renderer/datepicker-edit-cell", "@syncfusion/ej2-popups"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, ej2_base_4, events, edit_renderer_1, boolean_edit_cell_1, dropdown_edit_cell_1, numeric_edit_cell_1, default_edit_cell_1, inline_edit_1, batch_edit_1, dialog_edit_1, ej2_popups_1, util_1, ej2_inputs_1, datepicker_edit_cell_1, ej2_popups_2) {
             if (!data) {
-                if (ej2_base_4.isNullOrUndefined(gObj.selectedRowIndex) || gObj.selectedRowIndex === -1) {
+                if (!gObj.getSelectedRecords().length) {
                     this.showDialog('DeleteOperationAlert', this.alertDObj);
@@ -334,10 +334,7 @@ return;
                     var temp = col.edit.read;
+                    if (typeof temp === 'string') {
+                        temp = ej2_base_2.getValue(temp, window);
+                    }
                     if (col.type !== 'checkbox') {
-                        if (typeof temp === 'string') {
-                            temp = ej2_base_2.getValue(temp, window);
-                            value = gObj.editModule.getValueFromType(col, (temp)(inputs[i]));
-                        }
-                        else {
-                            value = gObj.editModule.getValueFromType(col, col.edit.read(inputs[i]));
-                        }
+                        value = gObj.editModule.getValueFromType(col, col.edit.read(inputs[i]));
                     }
@@ -364,11 +361,4 @@ else {
                 var col = cols_1[_i];
-                var temp = col.edit.destroy;
                 if (col.edit.destroy) {
-                    if (typeof temp === 'string') {
-                        temp = ej2_base_2.getValue(temp, window);
-                        temp();
-                    }
-                    else {
-                        col.edit.destroy();
-                    }
+                    col.edit.destroy();
                 }
@@ -404,3 +394,4 @@ }
                 case 'delete':
-                    if (e.target.tagName !== 'INPUT' && !document.querySelector('.e-popup-open')) {
+                    if ((e.target.tagName !== 'INPUT' || e.target.classList.contains('e-checkselect'))
+                        && !document.querySelector('.e-popup-open')) {
                         this.deleteRecord();
@@ -407,0 +398,0 @@ }

src/grid/actions/excel-export.js

@@ -527,2 +527,6 @@ define(["require", "exports", "../base/constant", "@syncfusion/ej2-excel-export", "@syncfusion/ej2-base", "../actions/data", "./export-helper", "../services/summary-model-generator", "../base/enum", "@syncfusion/ej2-data"], function (require, exports, events, ej2_excel_export_1, ej2_base_1, data_1, export_helper_1, summary_model_generator_1, enum_1, ej2_data_1) {
                     }
+                    var excelHeaderCellArgs = { cell: cell, gridCell: gridCell, setStyle: style };
+                    gObj.trigger(events.excelHeaderQueryCellInfo, ej2_base_1.extend(excelHeaderCellArgs, {
+                        cell: cell, setStyle: style
+                    }));
                     cell.style = style;
@@ -529,0 +533,0 @@ cells.push(cell);

src/grid/actions/export-helper.js

@@ -200,7 +200,15 @@ define(["require", "exports", "./../models/row", "../base/enum", "@syncfusion/ej2-base", "../models/cell", "./../services/value-formatter", "@syncfusion/ej2-data", "../base/util"], function (require, exports, row_1, enum_1, ej2_base_1, cell_1, value_formatter_1, ej2_data_1, util_1) {
         ExportHelper.prototype.checkDepth = function (col, index) {
+            var max = index;
+            var indices = [];
             if (col.columns) {
                 index++;
                 for (var i = 0; i < col.columns.length; i++) {
-                    index = this.checkDepth(col.columns[i], index);
+                    indices[i] = this.checkDepth(col.columns[i], index);
                 }
+                for (var j = 0; j < indices.length; j++) {
+                    if (max < indices[j]) {
+                        max = indices[j];
+                    }
+                }
+                index = max;
             }
@@ -270,7 +278,7 @@ return index;
             else {
-                if (args.column.type === undefined || args.column.type === null) {
-                    return '';
+                if ((!ej2_base_1.isNullOrUndefined(args.column.type) && !ej2_base_1.isNullOrUndefined(args.value)) || !ej2_base_1.isNullOrUndefined(args.value)) {
+                    return (args.value).toString();
                 }
                 else {
-                    return (args.value).toString();
+                    return '';
                 }
@@ -277,0 +285,0 @@ }

src/grid/actions/filter.js

@@ -433,3 +433,6 @@ define(["require", "exports", "@syncfusion/ej2-base", "../base/util", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../base/constant", "../base/enum", "../renderer/row-renderer", "../models/cell", "../models/row", "../renderer/filter-cell-renderer", "../base/util", "../renderer/filter-menu-renderer", "../actions/checkbox-filter", "../actions/excel-filter"], function (require, exports, ej2_base_1, util_1, ej2_base_2, ej2_data_1, events, enum_1, row_renderer_1, cell_1, row_1, filter_cell_renderer_1, util_2, filter_menu_renderer_1, checkbox_filter_1, excel_filter_1) {
                     this.parent.notify(events.modelChanged, {
-                        requestType: 'filtering', type: events.actionBegin
+                        requestType: 'filtering', type: events.actionBegin, currentFilterObject: {
+                            field: column.field, operator: this.operator, value: this.value, predicate: this.predicate,
+                            matchCase: this.matchCase, ignoreAccent: this.ignoreAccent, actualFilterValue: {}, actualOperator: {}
+                        }, currentFilterColumn: column
                     });
@@ -448,3 +451,4 @@ break;
             if (target && ej2_base_2.matches(target, '.e-filterbar input')) {
-                this.column = gObj.getColumnByField(target.id.split('_filterBarcell')[0]);
+                var closeHeaderEle = ej2_base_1.closest(target, 'th.e-filterbarcell');
+                this.column = gObj.getColumnByUid(closeHeaderEle.getAttribute('e-mappinguid'));
                 if (!this.column) {
@@ -467,2 +471,3 @@ return;
                 var gObj = this.parent;
+                var getFormatFlValue = void 0;
                 var columns = this.filterSettings.columns;
@@ -487,3 +492,9 @@ var formater = this.serviceLocator.getService('valueFormatter');
                                 this.values[column.field];
-                            var getFormatFlValue = this.setFormatForFlColumn(flValue, column);
+                            if (!(column.type === 'date' || column.type === 'datetime')) {
+                                var formater_1 = this.serviceLocator.getService('valueFormatter');
+                                getFormatFlValue = formater_1.toView(flValue, column.getParser()).toString();
+                            }
+                            else {
+                                getFormatFlValue = this.setFormatForFlColumn(flValue, column);
+                            }
                             this.filterStatusMsg += column.headerText + ': ' + getFormatFlValue;
@@ -550,3 +561,5 @@ }
                 }
-                this.value = templateRead.call(this, filterElement);
+                if (!ej2_base_1.isNullOrUndefined(templateRead)) {
+                    this.value = templateRead.call(this, filterElement);
+                }
             }
@@ -760,3 +773,3 @@ else {
                 }
-                this.parent.refresh();
+                this.parent.renderModule.refresh();
             }
@@ -763,0 +776,0 @@ this.parent.dataBind();

src/grid/actions/group.js

@@ -622,3 +622,5 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant", "../services/aria-service"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, util_1, events, aria_service_1) {
         Group.prototype.destroy = function () {
-            this.clearGrouping();
+            if (!this.parent.isDestroyed) {
+                this.clearGrouping();
+            }
             this.removeEventListener();
@@ -625,0 +627,0 @@ this.refreshToggleBtn(true);

src/grid/actions/normal-edit.js

@@ -42,3 +42,2 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant", "../renderer/row-renderer"], function (require, exports, ej2_base_1, ej2_base_2, util_1, events, row_renderer_1) {
                 case 'delete':
-                    this.parent.selectRow(this.editRowIndex);
                     this.parent.trigger(events.actionComplete, ej2_base_1.extend(e, {
@@ -48,2 +47,3 @@ requestType: 'delete',
                     }));
+                    this.parent.selectRow(this.editRowIndex);
                     break;
@@ -272,5 +272,24 @@ }
             this.editRowIndex = this.parent.selectedRowIndex;
+            if (data) {
+                data = (data instanceof Array) ? data : [data];
+                var gObj = this.parent;
+                var index = 0;
+                var dataLen = Object.keys(data).length;
+                fieldname = fieldname || this.parent.getPrimaryKeyFieldNames()[0];
+                var _loop_1 = function (i) {
+                    var tmpRecord;
+                    var contained = gObj.currentViewData.some(function (record) {
+                        tmpRecord = record;
+                        return data[i] === ej2_base_1.getValue(fieldname, record) || data[i] === record;
+                    });
+                    data[i] = contained ? tmpRecord : (_a = {}, _a[fieldname] = data[i], _a);
+                    var _a;
+                };
+                for (var i = 0; i < dataLen; i++) {
+                    _loop_1(i);
+                }
+            }
             this.parent.notify(events.modelChanged, {
                 requestType: 'delete', type: events.actionBegin, foreignKeyData: {},
-                data: data ? [data] : this.parent.getSelectedRecords(), tr: this.parent.getSelectedRows(), cancel: false
+                data: data ? data : this.parent.getSelectedRecords(), tr: this.parent.getSelectedRows(), cancel: false
             });
@@ -277,0 +296,0 @@ };

src/grid/actions/page.js

@@ -96,3 +96,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../../pager/pager", "../../pager/pager-dropdown", "../../pager/external-message", "../base/util", "../base/constant"], function (require, exports, ej2_base_1, ej2_base_2, pager_1, pager_dropdown_1, external_message_1, util_1, events) {
             var gObj = this.parent;
-            if (this.isForceCancel || util_1.isActionPrevent(gObj)) {
+            if (this.isForceCancel || util_1.isActionPrevent(gObj) && !gObj.prevPageMoving) {
                 if (!this.isForceCancel) {
@@ -110,2 +110,3 @@ gObj.notify(events.preventBatch, { instance: this, handler: this.goToPage, arg1: e.currentPage });
             }
+            gObj.prevPageMoving = false;
             var prevPage = this.pageSettings.currentPage;
@@ -112,0 +113,0 @@ this.pageSettings.currentPage = e.currentPage;

src/grid/actions/pdf-export.js

@@ -188,6 +188,6 @@ define(["require", "exports", "../base/constant", "@syncfusion/ej2-pdf-export", "@syncfusion/ej2-pdf-export", "@syncfusion/ej2-pdf-export", "@syncfusion/ej2-pdf-export", "@syncfusion/ej2-pdf-export", "@syncfusion/ej2-pdf-export", "./export-helper", "../actions/data", "../services/summary-model-generator", "@syncfusion/ej2-base", "../base/enum", "@syncfusion/ej2-data", "@syncfusion/ej2-base"], function (require, exports, events, ej2_pdf_export_1, ej2_pdf_export_2, ej2_pdf_export_3, ej2_pdf_export_4, ej2_pdf_export_5, ej2_pdf_export_6, export_helper_1, data_1, summary_model_generator_1, ej2_base_1, enum_1, ej2_data_1, ej2_base_2) {
                 if (!ej2_base_1.isNullOrUndefined(dataSourceItems.items.records)) {
-                    sRows = captionSummaryModel.generateRows(dataSourceItems.items.records, returnType.aggregates);
+                    sRows = captionSummaryModel.generateRows(dataSourceItems.items.records, dataSourceItems);
                 }
                 else {
-                    sRows = captionSummaryModel.generateRows(dataSourceItems.items, returnType.aggregates);
+                    sRows = captionSummaryModel.generateRows(dataSourceItems.items, dataSourceItems);
                 }
@@ -201,3 +201,3 @@ if (!ej2_base_1.isNullOrUndefined(sRows) && sRows.length === 0) {
                     var groupSummaryModel = new summary_model_generator_1.GroupSummaryModelGenerator(gObj);
-                    sRows = groupSummaryModel.generateRows(dataSourceItems.items.records, returnType.aggregates);
+                    sRows = groupSummaryModel.generateRows(dataSourceItems.items.records, dataSourceItems);
                     this.processAggregates(sRows, pdfGrid, border, font, brush, backgroundBrush, false);
@@ -209,3 +209,3 @@ }
                     var groupSummaryModel = new summary_model_generator_1.GroupSummaryModelGenerator(gObj);
-                    sRows = groupSummaryModel.generateRows(dataSourceItems.items, returnType.aggregates);
+                    sRows = groupSummaryModel.generateRows(dataSourceItems.items, dataSourceItems);
                     this.processAggregates(sRows, pdfGrid, border, font, brush, backgroundBrush, false);
@@ -217,2 +217,3 @@ }
             var columnCount = gridColumns.length;
+            var gObj = this.parent;
             if (this.isGrouping) {
@@ -247,2 +248,8 @@ columnCount += (childLevels + 1);
                         var cell = gridHeader.cells.getCell(cellIndex);
+                        var args = {
+                            cell: cell,
+                            gridCell: rows[i].cells[j],
+                            style: cell.style
+                        };
+                        gObj.trigger(events.pdfHeaderQueryCellInfo, args);
                         if (cell.value !== null) {
@@ -735,2 +742,6 @@ cell.value = rows[i].cells[j].column.headerText;
             }
+            if (!ej2_base_1.isNullOrUndefined(args.style.paragraphIndent)) {
+                cell.style.stringFormat = new ej2_pdf_export_3.PdfStringFormat();
+                cell.style.stringFormat.paragraphIndent = args.style.paragraphIndent;
+            }
         };
@@ -737,0 +748,0 @@ PdfExport.prototype.getHorizontalAlignment = function (textAlign, format) {

src/grid/actions/reorder.js

@@ -70,6 +70,15 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant"], function (require, exports, ej2_base_1, ej2_base_2, util_1, events) {
             var gObj = this.parent;
-            if (!ej2_base_2.closest(e.target, 'th')) {
+            var dropElement = this.element.querySelector('.e-headercelldiv') || this.element.querySelector('.e-stackedheadercelldiv');
+            var uId = dropElement.getAttribute('e-mappinguid');
+            var column = gObj.getColumnByUid(uId);
+            if (!ej2_base_2.closest(e.target, 'th') || (!ej2_base_1.isNullOrUndefined(column) && column.allowReordering === false)) {
                 return;
             }
             var destElem = ej2_base_2.closest(e.target, '.e-headercell');
+            var destElemDiv = destElem.querySelector('.e-headercelldiv') || destElem.querySelector('.e-stackedheadercelldiv');
+            var destElemUid = destElemDiv.getAttribute('e-mappinguid');
+            var destColumn = gObj.getColumnByUid(destElemUid);
+            if (ej2_base_1.isNullOrUndefined(destColumn) || destColumn.allowReordering === false) {
+                return;
+            }
             if (destElem && !(!this.chkDropPosition(this.element, destElem) || !this.chkDropAllCols(this.element, destElem))) {
@@ -81,3 +90,3 @@ if (this.parent.enableColumnVirtualization) {
                     var colMatchIndex_1 = null;
-                    var column = col[0];
+                    var column_1 = col[0];
                     var destUid_1 = destElem.querySelector('.e-headercelldiv').getAttribute('e-mappinguid');
@@ -92,3 +101,3 @@ var bool = columns.some(function (col, index) {
                     if (!ej2_base_1.isNullOrUndefined(colMatchIndex_1)) {
-                        this.moveColumns(colMatchIndex_1, column);
+                        this.moveColumns(colMatchIndex_1, column_1);
                     }
@@ -100,5 +109,5 @@ }
                     var columns = this.getColumnsModel(this.parent.columns);
-                    var column = columns[oldIdx];
+                    var column_2 = columns[oldIdx];
                     var newIndex = this.targetParentContainerIndex(this.element, destElem);
-                    this.moveColumns(newIndex, column);
+                    this.moveColumns(newIndex, column_2);
                 }
@@ -167,2 +176,7 @@ }
         Reorder.prototype.reorderColumns = function (fromFName, toFName) {
+            var fColumn = this.parent.getColumnByField(fromFName);
+            var toColumn = this.parent.getColumnByField(toFName);
+            if ((!ej2_base_1.isNullOrUndefined(fColumn) && !fColumn.allowReordering) || (!ej2_base_1.isNullOrUndefined(toColumn) && !toColumn.allowReordering)) {
+                return;
+            }
             var column = this.parent.getColumnByField(toFName);
@@ -206,2 +220,5 @@ var parent = this.getColParent(column, this.parent.columns);
             var target = e.target;
+            if (e.column.allowReordering === false) {
+                return;
+            }
             var closest = ej2_base_2.closest(target, '.e-headercell:not(.e-stackedHeaderCell)');
@@ -270,2 +287,5 @@ var cloneElement = gObj.element.querySelector('.e-cloneproperties');
                 util_1.parentsUntil(target, 'e-headercell');
+            if (e.column.allowReordering === false) {
+                return;
+            }
             this.x = util_1.getPosition(e.event).x + gObj.getContent().firstElementChild.scrollLeft;
@@ -272,0 +292,0 @@ gObj.trigger(events.columnDragStart, {

src/grid/actions/resize.d.ts

@@ -27,2 +27,3 @@ import { IGrid, IAction } from '../base/interface';
     private parentElementWidth;
+    isFrozenColResized: boolean;
     private parent;
@@ -67,3 +68,2 @@ private widthService;
     removeEventListener(): void;
-    private refreshHeight();
     /**
@@ -73,2 +73,3 @@ * @hidden
     render(): void;
+    private refreshHeight();
     private wireEvents();
@@ -75,0 +76,0 @@ private unwireEvents();

src/grid/actions/resize.js

@@ -1,2 +0,2 @@
-define(["require", "exports", "@syncfusion/ej2-base", "../services/width-controller", "../base/constant", "../base/util"], function (require, exports, ej2_base_1, width_controller_1, events, util_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "../models/column", "../services/width-controller", "../base/constant", "../base/util"], function (require, exports, ej2_base_1, column_1, width_controller_1, events, util_1) {
     "use strict";
@@ -67,2 +67,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
+            if (this.parent.detailTemplate || this.parent.childGrid) {
+                indentWidth += contentTable.querySelector('.e-detailrowcollapse').offsetWidth;
+            }
             var headerText = [headerTextClone];
@@ -89,2 +92,5 @@ var contentText = [];
             if (tWidth > 0 && !gObj.getFrozenColumns()) {
+                if (this.parent.detailTemplate || this.parent.childGrid) {
+                    this.widthService.setColumnWidth(new column_1.Column({ width: '30px' }));
+                }
                 headerTable.style.width = ej2_base_1.formatUnit(calcTableWidth);
@@ -130,2 +136,3 @@ contentTable.style.width = ej2_base_1.formatUnit(calcTableWidth);
             myTable.className = table.className;
+            myTable.classList.add('e-resizetable');
             myTable.style.cssText = 'table-layout: auto;width: auto';
@@ -160,2 +167,7 @@ var myTr = ej2_base_1.createElement('tr');
         };
+        Resize.prototype.render = function () {
+            this.unwireEvents();
+            this.wireEvents();
+            this.setHandlerHeight();
+        };
         Resize.prototype.refreshHeight = function () {
@@ -166,7 +178,2 @@ this.getResizeHandlers().forEach(function (ele) {
         };
-        Resize.prototype.render = function () {
-            this.unwireEvents();
-            this.wireEvents();
-            this.setHandlerHeight();
-        };
         Resize.prototype.wireEvents = function () {
@@ -271,3 +278,5 @@ ej2_base_1.EventHandler.add(this.parent.getHeaderContent(), ej2_base_1.Browser.touchStartEvent, this.resizeStart, this);
                 if (this.parent.getFrozenColumns()) {
-                    this.parent.notify(events.freezeRender, { case: 'textwrap' });
+                    if (!this.parent.getHeaderContent().querySelectorAll('.e-stackedheadercell').length) {
+                        this.parent.notify(events.freezeRender, { case: 'textwrap' });
+                    }
                 }
@@ -320,2 +329,11 @@ this.element.style.height = this.element.parentElement.offsetHeight + 'px';
             ej2_base_1.closest(this.element, '.e-headercell').classList.add('e-resized');
+            if (util_1.parentsUntil(this.element, 'e-frozenheader')) {
+                this.isFrozenColResized = true;
+            }
+            else {
+                this.isFrozenColResized = false;
+            }
+            if (this.parent.getFrozenColumns()) {
+                this.parent.notify(events.freezeRender, { case: 'textwrap' });
+            }
             this.refresh();
@@ -322,0 +340,0 @@ this.doubleTapEvent(e);

src/grid/actions/scroll.js

@@ -85,3 +85,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant", "../services/width-controller"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, util_1, constant_1, width_controller_1) {
             return function (e) {
-                if (_this.content.querySelector('tbody') === null) {
+                if (_this.content.querySelector('tbody') === null || _this.parent.isPreventScrollEvent) {
                     return;
@@ -131,3 +131,3 @@ }
                 }
-                var top = element.scrollTop + e.deltaMode === 1 ? e.deltaY * 30 : e.deltaY;
+                var top = element.scrollTop + (e.deltaMode === 1 ? e.deltaY * 30 : e.deltaY);
                 if (_this.previousValues.top === top) {
@@ -201,2 +201,3 @@ return;
         Scroll.prototype.wireEvents = function () {
+            var _this = this;
             if (this.oneTimeReady) {
@@ -233,15 +234,35 @@ var frzCols = this.parent.getFrozenColumns();
             var table = this.parent.getContentTable();
-            if (table.scrollHeight < this.parent.getContent().clientHeight) {
-                ej2_base_2.addClass(table.querySelectorAll('tr:last-child td'), 'e-lastrowcell');
-                if (this.parent.getFrozenColumns()) {
-                    ej2_base_2.addClass(this.parent.getContent().querySelector('.e-movablecontent').querySelectorAll('tr:last-child td'), 'e-lastrowcell');
+            var sLeft;
+            var sHeight;
+            var clientHeight;
+            util_1.getUpdateUsingRaf(function () {
+                sLeft = _this.header.scrollLeft;
+                sHeight = table.scrollHeight;
+                clientHeight = _this.parent.getContent().clientHeight;
+            }, function () {
+                if (!_this.parent.enableVirtualization) {
+                    if (sHeight < clientHeight) {
+                        ej2_base_2.addClass(table.querySelectorAll('tr:last-child td'), 'e-lastrowcell');
+                        if (_this.parent.getFrozenColumns()) {
+                            ej2_base_2.addClass(_this.parent.getContent().querySelector('.e-movablecontent').querySelectorAll('tr:last-child td'), 'e-lastrowcell');
+                        }
+                    }
+                    if ((_this.parent.frozenRows > 0 || _this.parent.frozenColumns > 0) && _this.header.querySelector('.e-movableheader')) {
+                        _this.header.querySelector('.e-movableheader').scrollLeft = _this.previousValues.left;
+                    }
+                    else {
+                        _this.header.scrollLeft = _this.previousValues.left;
+                    }
+                    _this.content.scrollLeft = _this.previousValues.left;
+                    _this.content.scrollTop = _this.previousValues.top;
                 }
-            }
-            if (!this.parent.enableVirtualization) {
-                this.content.scrollLeft = this.header.scrollLeft;
-                this.content.scrollTop = this.previousValues.top;
-            }
-            if (!this.parent.enableColumnVirtualization) {
-                this.content.scrollLeft = this.header.scrollLeft;
-            }
+                if (!_this.parent.enableColumnVirtualization) {
+                    _this.content.scrollLeft = sLeft;
+                }
+                if (_this.parent.frozenColumns) {
+                    _this.header.querySelector('.e-movableheader').scrollLeft =
+                        _this.content.querySelector('.e-movablecontent').scrollLeft;
+                }
+            });
+            this.parent.isPreventScrollEvent = false;
         };
@@ -248,0 +269,0 @@ Scroll.prototype.getCssProperties = function (rtl) {

src/grid/actions/selection.d.ts

@@ -130,2 +130,3 @@ import { IGrid, IAction, IIndex, ISelectedCell } from '../base/interface';
     private updatePersistCollection(selectedRow, chkState);
+    private updatePersistDelete(pKey);
     private updateCheckBoxes(row, chkState?);
@@ -229,3 +230,4 @@ private updateRowSelection(selectedRow, startIndex);
     private triggerChkChangeEvent(checkBox, checkState);
-    private setCheckAllState(isInteraction?);
+    private updateSelectedRowIndex(index?);
+    private setCheckAllState(index?, isInteraction?);
     private clickHandler(e);
@@ -232,0 +234,0 @@ private popUpClickHandler(e);

src/grid/actions/sort.js

@@ -82,5 +82,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant", "../services/aria-service"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, util_1, events, aria_service_1) {
             this.updateSortedCols(columnName, isMultiSort);
-            if (this.contentRefresh) {
-                this.updateModel();
-            }
+            this.updateModel();
         };
@@ -195,3 +193,2 @@ Sort.prototype.updateSortedCols = function (columnName, isMultiSort) {
                 this.contentRefresh = true;
-                this.addSortIcons();
             }
@@ -311,5 +308,2 @@ };
             var cols = this.sortSettings.columns;
-            if (cols.length > 1) {
-                this.isMultiSort = true;
-            }
             var fieldNames = this.parent.getColumns().map(function (c) { return c.field; });
@@ -333,3 +327,2 @@ for (var i = 0, len = cols.length; i < len; i++) {
             }
-            this.isMultiSort = false;
         };
@@ -336,0 +329,0 @@ Sort.prototype.removeSortIcons = function (position) {

src/grid/actions/virtual-scroll.js

@@ -1,2 +0,2 @@
-define(["require", "exports", "../base/util", "../base/constant", "../base/enum", "../renderer/virtual-content-renderer", "../base/constant"], function (require, exports, util_1, constant_1, enum_1, virtual_content_renderer_1, events) {
+define(["require", "exports", "../base/constant", "../base/enum", "../renderer/virtual-content-renderer", "../base/constant"], function (require, exports, constant_1, enum_1, virtual_content_renderer_1, events) {
     "use strict";
@@ -22,3 +22,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
         VirtualScroll.prototype.ensurePageSize = function () {
-            var rowHeight = util_1.getRowHeight(this.parent.element);
+            var rowHeight = this.parent.getRowHeight();
             this.blockSize = ~~(this.parent.height / rowHeight);
@@ -25,0 +25,0 @@ var height = this.blockSize * 2;

src/grid/base/constant.d.ts

@@ -12,2 +12,4 @@ /** @hidden */
 /** @hidden */
+export declare const headerCellInfo: string;
+/** @hidden */
 export declare const actionBegin: string;
@@ -251,2 +253,4 @@ /** @hidden */
 /** @hidden */
+export declare const excelHeaderQueryCellInfo: string;
+/** @hidden */
 export declare const beforePdfExport: string;
@@ -258,2 +262,4 @@ /** @hidden */
 /** @hidden */
+export declare const pdfHeaderQueryCellInfo: string;
+/** @hidden */
 export declare const accessPredicate: string;
@@ -296,1 +302,3 @@ /** @hidden */
 export declare const beforeFragAppend: string;
+/** @hidden */
+export declare const frozenHeight: string;

src/grid/base/constant.js

@@ -9,2 +9,3 @@ define(["require", "exports"], function (require, exports) {
     exports.queryCellInfo = 'queryCellInfo';
+    exports.headerCellInfo = 'headerCellInfo';
     exports.actionBegin = 'actionBegin';
@@ -128,5 +129,7 @@ exports.actionComplete = 'actionComplete';
     exports.excelQueryCellInfo = 'excelQueryCellInfo';
+    exports.excelHeaderQueryCellInfo = 'excelHeaderQueryCellInfo';
     exports.beforePdfExport = 'beforePdfExport';
     exports.pdfExportComplete = 'pdfExportComplete';
     exports.pdfQueryCellInfo = 'pdfQueryCellInfo';
+    exports.pdfHeaderQueryCellInfo = 'pdfHeaderQueryCellInfo';
     exports.accessPredicate = 'access-predicate';
@@ -151,2 +154,3 @@ exports.contextMenuClick = 'contextMenuClick';
     exports.beforeFragAppend = 'beforeFragAppend';
+    exports.frozenHeight = 'frozenHeight';
 });

src/grid/base/grid-model.d.ts

@@ -1,2 +0,2 @@
-import { Component, ModuleDeclaration, ChildProperty, Browser, closest, extend } from '@syncfusion/ej2-base';import { isNullOrUndefined, setValue, getValue } from '@syncfusion/ej2-base';import { createElement, addClass, removeClass, append, remove, classList } from '@syncfusion/ej2-base';import { Property, Collection, Complex, Event, NotifyPropertyChanges, INotifyPropertyChanged, L10n } from '@syncfusion/ej2-base';import { EventHandler, KeyboardEvents, KeyboardEventArgs, EmitType } from '@syncfusion/ej2-base';import { Query, DataManager, DataUtil } from '@syncfusion/ej2-data';import { ItemModel, ClickEventArgs } from '@syncfusion/ej2-navigations';import { createSpinner, hideSpinner, showSpinner, Tooltip } from '@syncfusion/ej2-popups';import { iterateArrayOrObject, prepareColumns, parentsUntil, wrap, templateCompiler, refreshForeignData } from './util';import * as events from '../base/constant';import { IRenderer, IValueFormatter, IFilterOperator, IIndex, RowDataBoundEventArgs, QueryCellInfoEventArgs } from './interface';import { CellDeselectEventArgs, CellSelectEventArgs, CellSelectingEventArgs, ParentDetails, ContextMenuItemModel } from './interface';import { PdfQueryCellInfoEventArgs, ExcelQueryCellInfoEventArgs, ExcelExportProperties, PdfExportProperties } from './interface';import { ColumnMenuOpenEventArgs, RecordDoubleClickEventArgs, DataResult, PendingState } from './interface';import { FailureEventArgs, FilterEventArgs, ColumnDragEventArgs, GroupEventArgs, PrintEventArgs, ICustomOptr } from './interface';import { RowDeselectEventArgs, RowSelectEventArgs, RowSelectingEventArgs, PageEventArgs, RowDragEventArgs } from './interface';import { BeforeBatchAddArgs, BeforeBatchDeleteArgs, BeforeBatchSaveArgs, ResizeArgs, ColumnMenuItemModel } from './interface';import { BatchAddArgs, BatchDeleteArgs, BeginEditArgs, CellEditArgs, CellSaveArgs, BeforeDataBoundArgs, RowInfo } from './interface';import { DetailDataBoundEventArgs, ColumnChooserEventArgs, AddEventArgs, SaveEventArgs, EditEventArgs, DeleteEventArgs } from './interface';import { ExcelExportCompleteArgs, PdfExportCompleteArgs, DataStateChangeEventArgs, DataSourceChangedEventArgs } from './interface';import { SearchEventArgs, SortEventArgs, ISelectedCell, EJ2Intance, BeforeCopyEventArgs, CheckBoxChangeEventArgs } from './interface';import { Render } from '../renderer/render';import { Column, ColumnModel } from '../models/column';import { Action, SelectionType, GridLine, RenderType, SortDirection, SelectionMode, PrintMode, FilterType, FilterBarMode } from './enum';import { WrapMode, ToolbarItems, ContextMenuItem, ColumnMenuItem, ToolbarItem, CellSelectionMode, EditMode } from './enum';import { Data } from '../actions/data';import { Cell } from '../models/cell';import { RowRenderer } from '../renderer/row-renderer';import { CellRenderer } from '../renderer/cell-renderer';import { CellRendererFactory } from '../services/cell-render-factory';import { ServiceLocator } from '../services/service-locator';import { ValueFormatter } from '../services/value-formatter';import { RendererFactory } from '../services/renderer-factory';import { ColumnWidthService } from '../services/width-controller';import { AriaService } from '../services/aria-service';import { FocusStrategy } from '../services/focus-strategy';import { PageSettingsModel, AggregateRowModel } from '../models/models';import { PageSettings } from '../models/page-settings';import { Sort } from '../actions/sort';import { Page } from '../actions/page';import { Selection } from '../actions/selection';import { Filter } from '../actions/filter';import { Search } from '../actions/search';import { Resize } from '../actions/resize';import { Reorder } from '../actions/reorder';import { RowDD } from '../actions/row-reorder';import { ShowHide } from '../actions/show-hide';import { Scroll } from '../actions/scroll';import { Group } from '../actions/group';import { Print } from '../actions/print';import { DetailRow } from '../actions/detail-row';import { Toolbar } from '../actions/toolbar';import { AggregateRow } from '../models/aggregate';import { Edit } from '../actions/edit';import { Row } from '../models/row';import { ColumnChooser } from '../actions/column-chooser';import { ExcelExport } from '../actions/excel-export';import { PdfExport } from '../actions/pdf-export';import { Clipboard } from '../actions/clipboard';import { CommandColumn } from '../actions/command-column';import { ContextMenu } from '../actions/context-menu';import { BeforeOpenCloseMenuEventArgs, MenuEventArgs } from '@syncfusion/ej2-navigations';import { ColumnMenu } from '../actions/column-menu';import { CheckState } from './enum';
+import { Component, ModuleDeclaration, ChildProperty, Browser, closest, extend } from '@syncfusion/ej2-base';import { isNullOrUndefined, setValue, getValue } from '@syncfusion/ej2-base';import { createElement, addClass, removeClass, append, remove, classList } from '@syncfusion/ej2-base';import { Property, Collection, Complex, Event, NotifyPropertyChanges, INotifyPropertyChanged, L10n } from '@syncfusion/ej2-base';import { EventHandler, KeyboardEvents, KeyboardEventArgs, EmitType } from '@syncfusion/ej2-base';import { Query, DataManager, DataUtil } from '@syncfusion/ej2-data';import { ItemModel, ClickEventArgs } from '@syncfusion/ej2-navigations';import { createSpinner, hideSpinner, showSpinner, Tooltip } from '@syncfusion/ej2-popups';import { iterateArrayOrObject, prepareColumns, parentsUntil, wrap, templateCompiler, refreshForeignData, getRowHeight } from './util';import * as events from '../base/constant';import { IRenderer, IValueFormatter, IFilterOperator, IIndex, RowDataBoundEventArgs, QueryCellInfoEventArgs } from './interface';import { CellDeselectEventArgs, CellSelectEventArgs, CellSelectingEventArgs, ParentDetails, ContextMenuItemModel } from './interface';import { PdfQueryCellInfoEventArgs, ExcelQueryCellInfoEventArgs, ExcelExportProperties, PdfExportProperties } from './interface';import { PdfHeaderQueryCellInfoEventArgs, ExcelHeaderQueryCellInfoEventArgs } from './interface';import { ColumnMenuOpenEventArgs, RecordDoubleClickEventArgs, DataResult, PendingState } from './interface';import { HeaderCellInfoEventArgs } from './interface';import { FailureEventArgs, FilterEventArgs, ColumnDragEventArgs, GroupEventArgs, PrintEventArgs, ICustomOptr } from './interface';import { RowDeselectEventArgs, RowSelectEventArgs, RowSelectingEventArgs, PageEventArgs, RowDragEventArgs } from './interface';import { BeforeBatchAddArgs, BeforeBatchDeleteArgs, BeforeBatchSaveArgs, ResizeArgs, ColumnMenuItemModel } from './interface';import { BatchAddArgs, BatchDeleteArgs, BeginEditArgs, CellEditArgs, CellSaveArgs, BeforeDataBoundArgs, RowInfo } from './interface';import { DetailDataBoundEventArgs, ColumnChooserEventArgs, AddEventArgs, SaveEventArgs, EditEventArgs, DeleteEventArgs } from './interface';import { ExcelExportCompleteArgs, PdfExportCompleteArgs, DataStateChangeEventArgs, DataSourceChangedEventArgs } from './interface';import { SearchEventArgs, SortEventArgs, ISelectedCell, EJ2Intance, BeforeCopyEventArgs, CheckBoxChangeEventArgs } from './interface';import { Render } from '../renderer/render';import { Column, ColumnModel } from '../models/column';import { Action, SelectionType, GridLine, RenderType, SortDirection, SelectionMode, PrintMode, FilterType, FilterBarMode } from './enum';import { WrapMode, ToolbarItems, ContextMenuItem, ColumnMenuItem, ToolbarItem, CellSelectionMode, EditMode } from './enum';import { Data } from '../actions/data';import { Cell } from '../models/cell';import { RowRenderer } from '../renderer/row-renderer';import { CellRenderer } from '../renderer/cell-renderer';import { CellRendererFactory } from '../services/cell-render-factory';import { ServiceLocator } from '../services/service-locator';import { ValueFormatter } from '../services/value-formatter';import { RendererFactory } from '../services/renderer-factory';import { ColumnWidthService } from '../services/width-controller';import { AriaService } from '../services/aria-service';import { FocusStrategy } from '../services/focus-strategy';import { PageSettingsModel, AggregateRowModel } from '../models/models';import { PageSettings } from '../models/page-settings';import { Sort } from '../actions/sort';import { Page } from '../actions/page';import { Selection } from '../actions/selection';import { Filter } from '../actions/filter';import { Search } from '../actions/search';import { Resize } from '../actions/resize';import { Reorder } from '../actions/reorder';import { RowDD } from '../actions/row-reorder';import { ShowHide } from '../actions/show-hide';import { Scroll } from '../actions/scroll';import { Group } from '../actions/group';import { Print } from '../actions/print';import { DetailRow } from '../actions/detail-row';import { Toolbar } from '../actions/toolbar';import { AggregateRow } from '../models/aggregate';import { Edit } from '../actions/edit';import { Row } from '../models/row';import { ColumnChooser } from '../actions/column-chooser';import { ExcelExport } from '../actions/excel-export';import { PdfExport } from '../actions/pdf-export';import { Clipboard } from '../actions/clipboard';import { CommandColumn } from '../actions/command-column';import { ContextMenu } from '../actions/context-menu';import { BeforeOpenCloseMenuEventArgs, MenuEventArgs } from '@syncfusion/ej2-navigations';import { ColumnMenu } from '../actions/column-menu';import { CheckState } from './enum';
 import {ComponentModel} from '@syncfusion/ej2-base';
@@ -813,3 +813,3 @@
      */
-    toolbar?: ToolbarItems[] | string[] | ItemModel[] | ToolbarItem[];
+    toolbar?: (ToolbarItems | string | ItemModel | ToolbarItem)[];
 
@@ -917,2 +917,8 @@ /**
     /**
+     * Triggered for stacked header.
+     * @event 
+     */
+    headerCellInfo?: EmitType<HeaderCellInfoEventArgs>;
+
+    /**
      * Triggers when Grid actions such as sorting, filtering, paging, grouping etc., starts. 
@@ -1032,2 +1038,8 @@ * @event
     /**
+     * Triggers before exporting each header cell to PDF document. You can also customize the PDF cells.
+     * @event 
+     */
+    pdfHeaderQueryCellInfo?: EmitType<PdfHeaderQueryCellInfoEventArgs>;
+
+    /**
      * Triggers before exporting each cell to Excel file.
@@ -1040,2 +1052,9 @@ * You can also customize the Excel cells.
     /**
+     * Triggers before exporting each header cell to Excel file.
+     * You can also customize the Excel cells.
+     * @event
+     */
+    excelHeaderQueryCellInfo?: EmitType<ExcelHeaderQueryCellInfoEventArgs>;
+
+    /**
      * Triggers before Grid data is exported to Excel file.
@@ -1042,0 +1061,0 @@ * @event

src/grid/base/interface.d.ts

@@ -17,2 +17,3 @@ import { Component, NumberFormatOptions, DateFormatOptions, EmitType, KeyboardEventArgs, L10n } from '@syncfusion/ej2-base';
 import { Edit } from '../actions/edit';
+import { Resize } from '../actions/resize';
 import { DropDownListModel } from '@syncfusion/ej2-dropdowns';
@@ -24,6 +25,7 @@ import { NumericTextBoxModel } from '@syncfusion/ej2-inputs';
 import { Matrix } from '../services/focus-strategy';
+import { CheckBoxFilter } from '../actions/checkbox-filter';
 import { PdfPageSize, PageOrientation, ContentType, PdfPageNumberType, PdfDashStyle, PdfHAlign, PdfVAlign } from './enum';
 import { FlMenuOptrUI } from '../renderer/filter-menu-operator';
 import { Dialog } from '@syncfusion/ej2-popups';
-import { CheckBoxFilter } from '../actions/checkbox-filter';
+import { Render } from '../renderer/render';
 /**
@@ -272,2 +274,3 @@ * Specifies grid interfaces.
     editModule?: Edit;
+    resizeModule: Resize;
     mergeCells?: {
@@ -280,2 +283,5 @@ [key: string]: number;
     localeObj?: L10n;
+    prevPageMoving?: boolean;
+    renderModule?: Render;
+    isPreventScrollEvent?: boolean;
     getHeaderContent?(): Element;
@@ -302,2 +308,3 @@ setGridHeaderContent?(value: Element): void;
     getColumnIndexByUid?(uid: string): number;
+    getColumnByIndex?(index: number): Column;
     getUidByColumnField?(field: string): string;
@@ -321,2 +328,3 @@ getNormalizedColumnIndex?(uid: string): number;
     getColumns?(isRefresh?: boolean): Column[];
+    getStackedHeaderColumnByHeaderText?(stackedHeader: string, col: Column[]): Column;
     getRowTemplate?(): Function;
@@ -368,2 +376,3 @@ getDetailTemplate?(): Function;
     getForeignKeyColumns?(): Column[];
+    getRowHeight?(): number;
     setCellValue(key: string | number, field: string, value: string | number | boolean | Date): void;
@@ -442,7 +451,7 @@ setRowData(key: string | number, rowData?: Object): void;
 export interface IEditCell {
-    create?: Element | Function | string;
-    read?: Object | Function | string;
-    write?: void | Function | string;
+    create?: Element | Function;
+    read?: Object | Function;
+    write?: void | Function;
     params?: DatePickerModel | NumericTextBoxModel | DropDownListModel;
-    destroy?: Function | string;
+    destroy?: Function;
 }
@@ -453,5 +462,5 @@ /**
 export interface IFilterUI {
-    create?: Element | Function | string;
-    read?: Object | Function | string;
-    write?: void | Function | string;
+    create?: Element | Function;
+    read?: Object | Function;
+    write?: void | Function;
 }
@@ -462,5 +471,5 @@ /**
 export interface IFilterMUI {
-    create?: void | Function | string;
-    read?: Object | Function | string;
-    write?: void | Function | string;
+    create?: void | Function;
+    read?: Object | Function;
+    write?: void | Function;
 }
@@ -765,2 +774,8 @@ /**
 }
+export interface HeaderCellInfoEventArgs {
+    /** Defines the cell. */
+    cell?: Cell<Column>;
+    /** Defines the cell element. */
+    node?: Element;
+}
 export interface QueryCellInfoEventArgs {
@@ -788,2 +803,10 @@ /** Defines the row data associated with this cell. */
 }
+export interface PdfHeaderQueryCellInfoEventArgs {
+    /** Defines the PDF grid current cell. */
+    cell?: object;
+    /** Defines the style of the current cell. */
+    style?: PdfStyle;
+    /** Defines the current cell with column */
+    gridCell?: object;
+}
 export interface ExcelQueryCellInfoEventArgs {
@@ -801,2 +824,8 @@ /** Defines the row data associated with this cell. */
 }
+export interface ExcelHeaderQueryCellInfoEventArgs {
+    /** Defines the cell that contains colspan. */
+    cell?: Object;
+    /** Defines the style of the current cell. */
+    style?: ExcelStyle;
+}
 export interface FilterSearchBeginEventArgs {
@@ -813,3 +842,3 @@ /** Defines the current action. */
     operator?: string;
-    /** Defines the matchcase for filter request */
+    /** Defines the matchCase for filter request */
     matchCase?: boolean;
@@ -854,2 +883,4 @@ /** Defines the ignoreAccent for filter request */
     bold?: boolean;
+    /** Defines the indent for cell style */
+    indent?: number;
     /** Defines the italic style for fonts */
@@ -879,2 +910,4 @@ italic?: boolean;
     bold?: boolean;
+    /** Defines the indent alignment */
+    indent?: PdfHAlign;
     /** Defines the italic font */
@@ -892,2 +925,4 @@ italic?: boolean;
     border?: PdfBorder;
+    /** Defines the cell indent */
+    paragraphIndent?: number;
 }
@@ -1280,6 +1315,9 @@ export interface PdfBorder {
     /**
+     * aggregate support for Custom data service
+     */
+    aggregates?: Object[];
+    /**
      *  DataSource changed through set model
      */
     isDataChanged?: Boolean;
-    aggregates?: Object[];
 }
@@ -1319,2 +1357,4 @@ /**
     count?: boolean;
+    /** Defines the checkbox filter dataSource */
+    dataSource?: Function;
 }
@@ -1388,2 +1428,3 @@ export interface DataSourceChangedEventArgs {
     skipAction?: boolean;
+    uid?: string;
 }
@@ -1637,2 +1678,3 @@ /**
     count: number;
+    aggregates?: object;
 }

src/grid/base/util.d.ts

@@ -65,3 +65,3 @@ import { IPosition, IGrid, IRow } from './interface';
 /** @hidden */
-export declare function appendChildren(elem: Element, children: Element[]): Element;
+export declare function appendChildren(elem: Element | DocumentFragment, children: Element[] | NodeList): Element;
 /** @hidden */
@@ -75,2 +75,3 @@ export declare function parents(elem: Element, selector: string, isID?: boolean): Element[];
 export declare function getRowHeight(element?: HTMLElement): number;
+/** @hidden */
 export declare function isComplexField(field: string): boolean;
@@ -77,0 +78,0 @@ /** @hidden */

src/grid/base/util.js

@@ -95,4 +95,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../models/column", "@syncfusion/ej2-popups"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, ej2_data_1, column_1, ej2_popups_1) {
             column.foreignKeyField = column.foreignKeyField || column.field;
-            column.valueAccessor = (typeof column.valueAccessor === 'string' ? ej2_base_2.getValue(column.valueAccessor, window)
-                : column.valueAccessor) || valueAccessor;
+            column.valueAccessor = column.valueAccessor || valueAccessor;
             column.width = autoWidth && ej2_base_2.isNullOrUndefined(column.width) ? 200 : column.width;
@@ -225,3 +224,2 @@ if (ej2_base_2.isNullOrUndefined(column.visible)) {
         }
-        children = null;
         return elem;
@@ -244,9 +242,5 @@ }
         if (type === 'Custom') {
-            var temp = column.customAggregate;
-            if (typeof temp === 'string') {
-                temp = ej2_base_2.getValue(temp, window);
-            }
-            return temp ? temp.call(context, data, column) : '';
+            return column.customAggregate ? column.customAggregate.call(context, data, column) : '';
         }
-        return ej2_data_1.DataUtil.aggregates[type.toLowerCase()](data, column.field);
+        return column.field in data ? ej2_data_1.DataUtil.aggregates[type.toLowerCase()](data, column.field) : null;
     }
@@ -253,0 +247,0 @@ exports.calculateAggregate = calculateAggregate;

src/grid/models/aggregate-model.d.ts

@@ -21,3 +21,3 @@ import { compile } from '@syncfusion/ej2-base';import { getEnumValue } from '@syncfusion/ej2-base';import { CustomSummaryType } from '../base/type';import { AggregateType, CellType } from '../base/enum';import { Property, Collection, ChildProperty, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import { ValueFormatter } from '../services/value-formatter';
      * > Specify the `type` value as `custom` to use custom aggregation.
-     * 
+     * @aspType string
      * @default null
@@ -45,2 +45,3 @@ */
      * and [`date`](../base/intl.html#date-formatter-and-parser) formats.
+     * @aspType string
      * @default null    
@@ -91,3 +92,3 @@ */
      */
-    customAggregate?: CustomSummaryType | string;
+    customAggregate?: CustomSummaryType;
 
@@ -94,0 +95,0 @@ }

src/grid/models/aggregate.d.ts

@@ -24,3 +24,3 @@ import { CustomSummaryType } from '../base/type';
      * > Specify the `type` value as `custom` to use custom aggregation.
-     *
+     * @aspType string
      * @default null
@@ -45,2 +45,3 @@ */
      * and [`date`](../base/intl.html#date-formatter-and-parser) formats.
+     * @aspType string
      * @default null
@@ -87,3 +88,3 @@ */
      */
-    customAggregate: CustomSummaryType | string;
+    customAggregate: CustomSummaryType;
     /**
@@ -90,0 +91,0 @@ * @hidden

src/grid/models/column.d.ts

@@ -5,3 +5,3 @@ import { NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';
 import { TextAlign, ClipMode } from '../base/enum';
-import { ValueAccessor, SortComparer } from '../base/type';
+import { ValueAccessor } from '../base/type';
 /**
@@ -61,3 +61,3 @@ * Represents Grid `Column` model class.
      * Define the alignment of column header which is used to align the text of column header.
-     * @default Left
+     * @default null
      */
@@ -81,2 +81,3 @@ headerTextAlign: TextAlign;
      * @default null
+     * @aspType string
      */
@@ -130,2 +131,8 @@ format: string | NumberFormatOptions | DateFormatOptions;
     /**
+     * If `allowReordering` set to false, then it disables reorder of a particular column.
+     * By default all columns can be reorder.
+     * @default true
+     */
+    allowReordering: boolean;
+    /**
      * If `showColumnMenu` set to false, then it disable the column menu of a particular column.
@@ -182,3 +189,3 @@ * By default column menu will show for all columns
      */
-    valueAccessor: ValueAccessor | string;
+    valueAccessor: ValueAccessor;
     /**
@@ -313,3 +320,3 @@ * The `filterBarTemplate` is used to add a custom component instead of default input component for filter bar.
      */
-    sortComparer: SortComparer | string;
+    sortComparer: (x: number | string, y: number | string) => number;
     /**
@@ -392,3 +399,4 @@ * @hidden
      * Define the alignment of column header which is used to align the text of column header.
-     * @default undefined
+     * @aspdefaultvalueignore
+     * @default null
      */
@@ -412,2 +420,3 @@ headerTextAlign?: TextAlign;
      * @default null
+     * @aspType string
      */
@@ -466,2 +475,8 @@ format?: string | NumberFormatOptions | DateFormatOptions;
     /**
+     * If `allowReordering` set to false, then it disables reorder of a particular column.
+     * By default all columns can be reorder.
+     * @default true
+     */
+    allowReordering?: boolean;
+    /**
      * If `enableGroupByFormat` set to true, then it groups the particular column by formatted values.
@@ -562,3 +577,3 @@ * By default no columns are group by format.
      */
-    valueAccessor?: ValueAccessor | string;
+    valueAccessor?: ValueAccessor;
     /**
@@ -711,3 +726,3 @@ * The `filterBarTemplate` is used to add a custom component instead of default input component for filter bar.
      */
-    sortComparer?: SortComparer | string;
+    sortComparer?: (x: number | string, y: number | string) => number;
     /**
@@ -714,0 +729,0 @@ * @hidden

src/grid/models/column.js

@@ -11,2 +11,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../services/value-formatter", "../base/util"], function (require, exports, ej2_base_1, ej2_data_1, value_formatter_1, util_1) {
             this.allowGrouping = true;
+            this.allowReordering = true;
             this.showColumnMenu = true;
@@ -53,5 +54,2 @@ this.enableGroupByFormat = false;
                 this.sortComparer = function comparer(x, y) {
-                    if (typeof a_1 === 'string') {
-                        a_1 = ej2_base_1.getValue(a_1, window);
-                    }
                     if (this.sortDirection === 'Descending') {
@@ -58,0 +56,0 @@ var z = x;

src/grid/renderer/content-renderer.d.ts

@@ -17,2 +17,3 @@ import { IRenderer, IGrid, NotifyArgs, IModelGenerator } from '../base/interface';
     private freezeRowElements;
+    private index;
     colgroup: Element;
@@ -19,0 +20,0 @@ private isLoaded;

src/grid/renderer/content-renderer.js

@@ -37,3 +37,5 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "../base/constant", "./row-renderer", "./cell-merge-renderer", "../services/row-model-generator", "../services/group-model-generator", "../base/util"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, util_1, events, row_renderer_1, cell_merge_renderer_1, row_model_generator_1, group_model_generator_1, util_2) {
                     }
-                    _this.parent.hideSpinner();
+                    if (_this.isLoaded) {
+                        _this.parent.hideSpinner();
+                    }
                 };
@@ -117,7 +119,10 @@ };
             this.rows = [];
-            var modelData = this.generator.generateRows(dataSource, args);
-            var idx = modelData[0].cells[0].index;
             var fCont = this.getPanel().querySelector('.e-frozencontent');
             var mCont = this.getPanel().querySelector('.e-movablecontent');
             var cont = this.getPanel().querySelector('.e-content');
+            var modelData = this.generator.generateRows(dataSource, args);
+            if (ej2_base_2.isNullOrUndefined(modelData[0].cells[0])) {
+                mCont.querySelector('tbody').innerHTML = '';
+            }
+            var idx = modelData[0].cells[0].index;
             if (this.parent.registeredTemplate && this.parent.registeredTemplate.template) {
@@ -139,18 +144,34 @@ this.parent.destroyTemplate(['template']);
                     tr = row.render(modelData[i], columns);
+                    if (gObj.frozenRows && i < gObj.frozenRows) {
+                        hdrfrag.appendChild(tr);
+                    }
+                    else {
+                        frag.appendChild(tr);
+                    }
                 }
                 else {
                     var elements = gObj.getRowTemplate()(ej2_base_2.extend({ index: i }, dataSource[i]), gObj, 'rowTemplate');
-                    for (var j = 0; j < elements.length; j++) {
-                        var isTR = elements[j].nodeName.toLowerCase() === 'tr';
-                        if (isTR || (elements[j].querySelectorAll && elements[j].querySelectorAll('tr').length)) {
-                            tr = isTR ? elements[j] : elements[j].querySelector('tr');
+                    if (elements[0].tagName === 'TBODY') {
+                        for (var j = 0; j < elements.length; j++) {
+                            var isTR = elements[j].nodeName.toLowerCase() === 'tr';
+                            if (isTR || (elements[j].querySelectorAll && elements[j].querySelectorAll('tr').length)) {
+                                tr = isTR ? elements[j] : elements[j].querySelector('tr');
+                            }
                         }
+                        if (gObj.frozenRows && i < gObj.frozenRows) {
+                            hdrfrag.appendChild(tr);
+                        }
+                        else {
+                            frag.appendChild(tr);
+                        }
                     }
+                    else {
+                        if (gObj.frozenRows && i < gObj.frozenRows) {
+                            tr = util_1.appendChildren(hdrfrag, elements);
+                        }
+                        else {
+                            tr = util_1.appendChildren(frag, elements);
+                        }
+                    }
                 }
-                if (gObj.frozenRows && i < gObj.frozenRows) {
-                    hdrfrag.appendChild(tr);
-                }
-                else {
-                    frag.appendChild(tr);
-                }
                 this.rows.push(modelData[i]);
@@ -181,9 +202,12 @@ if (modelData[i].isDataRow) {
             args.isFrozen = this.parent.getFrozenColumns() !== 0 && !args.isFrozen;
+            this.index = idx;
             util_1.getUpdateUsingRaf(function () {
                 _this.parent.notify(events.beforeFragAppend, {});
-                ej2_base_3.remove(_this.tbody);
-                _this.tbody = ej2_base_3.createElement('tbody');
+                if (!_this.parent.enableVirtualization) {
+                    ej2_base_3.remove(_this.tbody);
+                    _this.tbody = ej2_base_3.createElement('tbody');
+                }
                 if (frzCols) {
                     _this.tbody.appendChild(frag);
-                    if (idx === 0) {
+                    if (_this.index === 0) {
                         _this.isLoaded = false;
@@ -190,0 +214,0 @@ fCont.querySelector('table').appendChild(_this.tbody);

src/grid/renderer/datepicker-edit-cell.js

@@ -23,8 +23,10 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-calendars", "../base/util"], function (require, exports, ej2_base_1, ej2_base_2, ej2_calendars_1, util_1) {
             var isInline = this.parent.editSettings.mode !== 'Dialog';
-            var isComplex = !ej2_base_2.isNullOrUndefined(args.column.field) && util_1.isComplexField(args.column.field);
+            var isComplex = util_1.isComplexField(args.column.field);
             var isAddRow = args.requestType === 'add' || args.row.classList.contains('e-addedrow');
+            var value = isComplex && !isAddRow ?
+                util_1.getComplexValue(args.rowData, args.column.field) : args.rowData[args.column.field];
+            value = value ? new Date(value) : null;
             this.obj = new ej2_calendars_1.DatePicker(ej2_base_1.extend({
                 floatLabelType: isInline ? 'Never' : 'Always',
-                value: isComplex && !isAddRow ?
-                    new Date(util_1.getComplexValue(args.rowData, args.column.field)) : new Date(args.rowData[args.column.field]),
+                value: value,
                 placeholder: isInline ?
@@ -31,0 +33,0 @@ '' : args.column.headerText, enableRtl: this.parent.enableRtl,

src/grid/renderer/dialog-edit-renderer.js

@@ -33,3 +33,3 @@ define(["require", "exports", "@syncfusion/ej2-popups", "@syncfusion/ej2-base", "../base/constant", "../base/util"], function (require, exports, ej2_popups_1, ej2_base_1, events, util_1) {
             this.dialogObj = new ej2_popups_1.Dialog({
-                header: this.isEdit ? this.l10n.getConstant('EditFormTitle') + '  ' + args.primaryKeyValue[0] :
+                header: this.isEdit ? this.l10n.getConstant('EditFormTitle') + args.primaryKeyValue[0] :
                     this.l10n.getConstant('AddFormTitle'), isModal: true, visible: true, cssClass: 'e-edit-dialog',
@@ -36,0 +36,0 @@ content: this.getEditElement(elements),

src/grid/renderer/dropdown-edit-cell.js

@@ -9,4 +9,4 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-dropdowns", "@syncfusion/ej2-data", "../base/util", "../base/util"], function (require, exports, ej2_base_1, ej2_base_2, ej2_dropdowns_1, ej2_data_1, util_1, util_2) {
         DropDownEditCell.prototype.create = function (args) {
-            var complexFieldName = !ej2_base_1.isNullOrUndefined(args.column.field) && util_1.getComplexFieldID(args.column.field);
-            var isComplex = !ej2_base_1.isNullOrUndefined(args.column.field) && util_1.isComplexField(args.column.field);
+            var complexFieldName = util_1.getComplexFieldID(args.column.field);
+            var isComplex = util_1.isComplexField(args.column.field);
             return ej2_base_2.createElement('input', {
@@ -21,5 +21,5 @@ className: 'e-field', attrs: {
             this.column = args.column;
+            var complexFieldName = util_1.getComplexFieldID(args.column.field);
+            var isComplex = util_1.isComplexField(args.column.field);
             var isInline = this.parent.editSettings.mode !== 'Dialog';
-            var complexFieldName = !ej2_base_1.isNullOrUndefined(args.column.field) && util_1.getComplexFieldID(args.column.field);
-            var isComplex = !ej2_base_1.isNullOrUndefined(args.column.field) && util_1.isComplexField(args.column.field);
             var isAddRow = args.requestType === 'add' || args.row.classList.contains('e-addedrow');
@@ -26,0 +26,0 @@ this.obj = new ej2_dropdowns_1.DropDownList(ej2_base_1.extend({

src/grid/renderer/edit-renderer.js

@@ -46,3 +46,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "./inline-edit-renderer", "./batch-edit-renderer", "./dialog-edit-renderer", "@syncfusion/ej2-base", "../base/enum", "../services/row-model-generator", "../base/util"], function (require, exports, ej2_base_1, inline_edit_renderer_1, batch_edit_renderer_1, dialog_edit_renderer_1, ej2_base_2, enum_1, row_model_generator_1, util_1) {
                 }
-                value = (col.valueAccessor(col.field, args.rowData, col));
+                value = col.valueAccessor(col.field, args.rowData, col);
                 if (frzCols && cols.indexOf(col) >= frzCols && gObj.editSettings.mode === 'Normal') {
@@ -56,15 +56,6 @@ cell = fForm.querySelector('[e-mappinguid=' + col.uid + ']');
                 if (!ej2_base_1.isNullOrUndefined(cell)) {
-                    if (typeof temp === 'string') {
-                        temp = ej2_base_1.getValue(temp, window);
-                        temp({
-                            rowData: args.rowData, element: cell, column: col, requestType: args.requestType, row: args.row,
-                            foreignKeyData: col.isForeignColumn() && ej2_base_1.getValue(col.field, args.foreignKeyData)
-                        });
-                    }
-                    else {
-                        col.edit.write({
-                            rowData: args.rowData, element: cell, column: col, requestType: args.requestType, type: args.type, row: args.row,
-                            foreignKeyData: col.isForeignColumn() && ej2_base_1.getValue(col.field, args.foreignKeyData)
-                        });
-                    }
+                    col.edit.write({
+                        rowData: args.rowData, element: cell, column: col, requestType: args.requestType, type: args.type, row: args.row,
+                        foreignKeyData: col.isForeignColumn() && ej2_base_1.getValue(col.field, args.foreignKeyData)
+                    });
                     if (!isFocused && !cell.getAttribute('disabled')) {
@@ -112,13 +103,7 @@ this.focusElement(cell, args.type);
                 }
-                var value = (col.valueAccessor(col.field, args.rowData, col));
+                var value = col.valueAccessor(col.field, args.rowData, col);
                 var tArgs = { column: col, value: value, type: args.requestType, data: args.rowData };
                 var temp = col.edit.create;
                 var input = void 0;
-                if (typeof temp === 'string') {
-                    temp = ej2_base_1.getValue(temp, window);
-                    input = temp(tArgs);
-                }
-                else {
-                    input = col.edit.create(tArgs);
-                }
+                input = col.edit.create(tArgs);
                 if (typeof input === 'string') {
@@ -125,0 +110,0 @@ var div = ej2_base_2.createElement('div');

src/grid/renderer/filter-cell-renderer.js

@@ -31,2 +31,3 @@ var __extends = (this && this.__extends) || (function () {
             tr.appendChild(node);
+            node.setAttribute('e-mappinguid', column.uid);
             if (column.type !== 'checkbox') {
@@ -33,0 +34,0 @@ if ((ej2_base_1.isNullOrUndefined(column.allowFiltering) || column.allowFiltering) && !ej2_base_1.isNullOrUndefined(column.filterBarTemplate)) {

src/grid/renderer/filter-menu-operator.js

@@ -39,3 +39,3 @@ define(["require", "exports", "@syncfusion/ej2-dropdowns", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-data"], function (require, exports, ej2_dropdowns_1, ej2_base_1, ej2_base_2, ej2_data_1) {
                 var column = columns_1[_i];
-                if (col.field === column.field) {
+                if (col.field === column.field || (col.isForeignColumn() && col.foreignKeyValue === column.field)) {
                     var selectedField = new ej2_data_1.DataManager(this.optrData).executeLocal(new ej2_data_1.Query().where('value', 'equal', column.operator));
@@ -42,0 +42,0 @@ selValue = !ej2_base_1.isNullOrUndefined(selectedField[0]) ? selectedField[0].text : '';

src/grid/renderer/filter-menu-renderer.js

@@ -102,13 +102,7 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-popups", "./filter-menu-operator", "./string-filter-ui", "./number-filter-ui", "./boolean-filter-ui", "./date-filter-ui", "../base/util", "../base/constant"], function (require, exports, ej2_base_1, ej2_base_2, ej2_popups_1, filter_menu_operator_1, string_filter_ui_1, number_filter_ui_1, boolean_filter_ui_1, date_filter_ui_1, util_1, events) {
                     temp = ej2_base_1.getValue(temp, window);
-                    temp({
-                        column: column, target: valueDiv,
-                        getOptrInstance: this.flMuiObj, dialogObj: this.dlgObj
-                    });
                 }
-                else {
-                    column.filter.ui.create({
-                        column: column, target: valueDiv,
-                        getOptrInstance: this.flMuiObj, dialogObj: this.dlgObj
-                    });
-                }
+                temp({
+                    column: column, target: valueDiv,
+                    getOptrInstance: this.flMuiObj, dialogObj: this.dlgObj
+                });
             }
@@ -138,7 +132,4 @@ else {
                     temp = ej2_base_1.getValue(temp, window);
-                    temp({ column: col, target: target, parent: this.parent, filteredValue: flValue });
                 }
-                else {
-                    col.filter.ui.write({ column: col, target: target, parent: this.parent, filteredValue: flValue });
-                }
+                temp({ column: col, target: target, parent: this.parent, filteredValue: flValue });
             }
@@ -160,7 +151,4 @@ else {
                     temp = ej2_base_1.getValue(temp, window);
-                    flValue = temp({ element: targ, column: col, operator: flOptrValue, fltrObj: this.filterObj });
                 }
-                else {
-                    flValue = col.filter.ui.read({ element: targ, column: col, operator: flOptrValue, fltrObj: this.filterObj });
-                }
+                flValue = temp({ element: targ, column: col, operator: flOptrValue, fltrObj: this.filterObj });
             }
@@ -167,0 +155,0 @@ else {

src/grid/renderer/freeze-renderer.d.ts

@@ -28,2 +28,3 @@ import { IGrid, IRenderer, IModelGenerator } from '../base/interface';
     addEventListener(): void;
+    removeEventListener(): void;
     renderTable(): void;
@@ -33,5 +34,7 @@ renderPanel(): void;
     private rfshMovable();
+    private addMovableFirstCls();
     private refreshFreeze(obj);
     private updateResizeHandler();
     private setWrapHeight(fRows, mRows, isModeChg, isContReset?, isStackedHdr?);
+    private setFrozenHeight();
     private refreshStackedHdrHgt();
@@ -38,0 +41,0 @@ private getRowSpan(row);

src/grid/renderer/freeze-renderer.js

@@ -74,3 +74,10 @@ var __extends = (this && this.__extends) || (function () {
             this.parent.on(events.freezeRender, this.refreshFreeze, this);
+            this.parent.on(events.frozenHeight, this.setFrozenHeight, this);
         };
+        FreezeRender.prototype.removeEventListener = function () {
+            if (this.parent.isDestroyed) {
+                return;
+            }
+            this.parent.off(events.frozenHeight, this.setFrozenHeight);
+        };
         FreezeRender.prototype.renderTable = function () {
@@ -108,3 +115,20 @@ _super.prototype.renderTable.call(this);
             this.refreshStackedHdrHgt();
+            this.addMovableFirstCls();
         };
+        FreezeRender.prototype.addMovableFirstCls = function () {
+            if (this.parent.getVisibleFrozenColumns()) {
+                var movablefirstcell = this.parent.element.querySelector('.e-movableheader').querySelector('thead').querySelectorAll('.e-columnheader');
+                var len = this.parent.element.querySelector('.e-movableheader').querySelector('thead').querySelectorAll('.e-columnheader').length;
+                for (var i = 0; i < len; i++) {
+                    var cells = 'cells';
+                    var element = movablefirstcell[i][cells][0];
+                    if (element) {
+                        ej2_base_1.addClass([element], ['e-movablefirst']);
+                        if (movablefirstcell[i][cells][0].rowSpan > 1) {
+                            i = i + (movablefirstcell[i][cells][0].rowSpan - 1);
+                        }
+                    }
+                }
+            }
+        };
         FreezeRender.prototype.refreshFreeze = function (obj) {
@@ -145,3 +169,5 @@ if (obj.case === 'filter') {
                 }
-                this.setWrapHeight(fRows, mRows, obj.isModeChg, false, this.colDepth > 1);
+                if (!this.parent.getHeaderContent().querySelectorAll('.e-stackedheadercell').length) {
+                    this.setWrapHeight(fRows, mRows, obj.isModeChg, false, this.colDepth > 1);
+                }
                 this.refreshStackedHdrHgt();
@@ -176,18 +202,27 @@ }
                 mRowHgt = width[i];
-                if (fRows[i].childElementCount && ((isWrap && fRowHgt < mRowHgt) || (!isWrap && fRowHgt > mRowHgt))) {
-                    fRows[i].style.height = mRowHgt + 'px';
+                if (fRows[i].childElementCount && ((isWrap && fRowHgt < mRowHgt) || (!isWrap && fRowHgt > mRowHgt) ||
+                    (this.parent.allowResizing && !this.parent.resizeModule.isFrozenColResized))) {
+                    if (!this.parent.allowResizing || (this.parent.allowResizing && !this.parent.resizeModule.isFrozenColResized)) {
+                        fRows[i].style.height = mRowHgt + 'px';
+                    }
                 }
-                else if (mRows[i].childElementCount && ((isWrap && fRowHgt > mRowHgt) || (!isWrap && fRowHgt < mRowHgt))) {
-                    mRows[i].style.height = fRowHgt + 'px';
+                if (mRows[i].childElementCount && ((isWrap && fRowHgt > mRowHgt) || (!isWrap && fRowHgt < mRowHgt) ||
+                    (this.parent.allowResizing && this.parent.resizeModule.isFrozenColResized))) {
+                    if (!this.parent.allowResizing || (this.parent.allowResizing && this.parent.resizeModule.isFrozenColResized)) {
+                        mRows[i].style.height = fRowHgt + 'px';
+                    }
                 }
             }
             if (isWrap) {
-                var movableContentHeight = this.parent.element.querySelector('.e-movablecontent').getBoundingClientRect().height;
-                var frozenContentHeight = this.parent.element.querySelector('.e-frozencontent').getBoundingClientRect().height;
-                if (movableContentHeight > frozenContentHeight) {
-                    this.parent.element.querySelector('.e-frozencontent').style.height = movableContentHeight -
-                        util_1.getScrollBarWidth() + 'px';
-                }
+                this.setFrozenHeight();
             }
         };
+        FreezeRender.prototype.setFrozenHeight = function () {
+            var movableContentHeight = this.parent.element.querySelector('.e-movablecontent').getBoundingClientRect().height;
+            var frozenContentHeight = this.parent.element.querySelector('.e-frozencontent').getBoundingClientRect().height;
+            if (movableContentHeight > frozenContentHeight) {
+                this.parent.element.querySelector('.e-frozencontent').style.height = movableContentHeight -
+                    util_1.getScrollBarWidth() + 'px';
+            }
+        };
         FreezeRender.prototype.refreshStackedHdrHgt = function () {
@@ -229,3 +264,4 @@ var fRowSpan;
             for (var i = 0; i < maxRowSpan; i++) {
-                height += rows[idx + i].offsetHeight;
+                height += rows[idx + i].style.height ?
+                    parseInt(rows[idx + i].style.height, 10) : rows[idx + i].offsetHeight;
             }
@@ -232,0 +268,0 @@ row.style.height = height + 'px';

src/grid/renderer/header-cell-renderer.js

@@ -11,3 +11,3 @@ var __extends = (this && this.__extends) || (function () {
 })();
-define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "./cell-renderer", "../services/aria-service", "@syncfusion/ej2-buttons"], function (require, exports, ej2_base_1, ej2_base_2, util_1, cell_renderer_1, aria_service_1, ej2_buttons_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/util", "./cell-renderer", "../services/aria-service", "@syncfusion/ej2-buttons", "../base/constant"], function (require, exports, ej2_base_1, ej2_base_2, util_1, cell_renderer_1, aria_service_1, ej2_buttons_1, constant_1) {
     "use strict";
@@ -128,2 +128,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
             node.setAttribute('aria-colspan', '1');
+            this.parent.trigger(constant_1.headerCellInfo, { cell: cell, node: node });
             return node;
@@ -130,0 +131,0 @@ };

src/grid/renderer/header-indent-renderer.js

@@ -23,3 +23,3 @@ var __extends = (this && this.__extends) || (function () {
             var node = this.element.cloneNode();
-            node.appendChild(ej2_base_1.createElement('div', { className: 'e-headercelldiv e-emptycell', innerHTML: ' ' }));
+            node.appendChild(ej2_base_1.createElement('div', { className: 'e-headercelldiv e-emptycell', innerHTML: '' }));
             return node;
@@ -26,0 +26,0 @@ };

src/grid/renderer/header-renderer.js

@@ -22,6 +22,11 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/enum", "./row-renderer", "../models/cell", "../models/row", "../base/constant", "@syncfusion/ej2-base", "../base/util"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, enum_1, row_renderer_1, cell_1, row_1, events, ej2_base_4, util_1) {
                 var height = element.offsetHeight;
-                var headercelldiv = element.querySelector('.e-headercelldiv');
+                var headercelldiv = element.querySelector('.e-headercelldiv') || element.querySelector('.e-stackedheadercelldiv');
                 var col;
                 if (headercelldiv) {
-                    col = gObj.getColumnByUid(headercelldiv.getAttribute('e-mappinguid'));
+                    if (element.querySelector('.e-stackedheadercelldiv')) {
+                        col = gObj.getStackedHeaderColumnByHeaderText(headercelldiv.innerText.trim(), gObj.columns);
+                    }
+                    else {
+                        col = gObj.getColumnByUid(headercelldiv.getAttribute('e-mappinguid'));
+                    }
                     _this.column = col;
@@ -199,3 +204,3 @@ visualElement.setAttribute('e-mappinguid', _this.column.uid);
                 headerRow = rowRenderer.render(rows[i], columns);
-                if (this.parent.rowHeight) {
+                if (this.parent.rowHeight && headerRow.querySelector('.e-headercell')) {
                     headerRow.style.height = this.parent.rowHeight + 'px';
@@ -427,7 +432,15 @@ }
         HeaderRender.prototype.checkDepth = function (col, index) {
+            var max = index;
+            var indices = [];
             if (col.columns) {
                 index++;
                 for (var i = 0, len = col.columns.length; i < len; i++) {
-                    index = this.checkDepth(col.columns[i], index);
+                    indices[i] = this.checkDepth(col.columns[i], index);
                 }
+                for (var j = 0; j < indices.length; j++) {
+                    if (max < indices[j]) {
+                        max = indices[j];
+                    }
+                }
+                index = max;
             }
@@ -434,0 +447,0 @@ return index;

src/grid/renderer/inline-edit-renderer.js

@@ -1,2 +0,2 @@
-define(["require", "exports", "@syncfusion/ej2-base"], function (require, exports, ej2_base_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "../base/constant"], function (require, exports, ej2_base_1, events) {
     "use strict";
@@ -34,2 +34,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 mEle.setAttribute('colspan', '' + (this.parent.getVisibleColumns().length - this.parent.getVisibleFrozenColumns()));
+                if (this.parent.height === 'auto') {
+                    this.parent.notify(events.frozenHeight, {});
+                }
             }
@@ -36,0 +39,0 @@ };

src/grid/renderer/numeric-edit-cell.js

@@ -9,4 +9,4 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-inputs", "../base/util"], function (require, exports, ej2_base_1, ej2_base_2, ej2_inputs_1, util_1) {
         NumericEditCell.prototype.create = function (args) {
-            var isComplex = !ej2_base_2.isNullOrUndefined(args.column.field) && util_1.isComplexField(args.column.field);
-            var complexFieldName = !ej2_base_2.isNullOrUndefined(args.column.field) && util_1.getComplexFieldID(args.column.field);
+            var isComplex = util_1.isComplexField(args.column.field);
+            var complexFieldName = util_1.getComplexFieldID(args.column.field);
             return ej2_base_2.createElement('input', {
@@ -26,4 +26,4 @@ className: 'e-field', attrs: {
             var isInline = this.parent.editSettings.mode !== 'Dialog';
-            var isComplex = !ej2_base_2.isNullOrUndefined(args.column.field) && util_1.isComplexField(args.column.field);
-            var complexFieldName = !ej2_base_2.isNullOrUndefined(args.column.field) && util_1.getComplexFieldID(args.column.field);
+            var isComplex = util_1.isComplexField(args.column.field);
+            var complexFieldName = util_1.getComplexFieldID(args.column.field);
             var isAddRow = args.requestType === 'add' || args.row.classList.contains('e-addedrow');
@@ -30,0 +30,0 @@ this.obj = new ej2_inputs_1.NumericTextBox(ej2_base_1.extend({

src/grid/renderer/render.js

@@ -194,2 +194,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../services/value-formatter", "../base/enum", "../actions/data", "../models/row", "../models/cell", "../base/constant", "../base/util", "../renderer/content-renderer", "../renderer/header-renderer", "../renderer/cell-renderer", "../renderer/header-cell-renderer", "../renderer/stacked-cell-renderer", "../renderer/indent-cell-renderer", "../renderer/caption-cell-renderer", "../renderer/expand-cell-renderer", "../renderer/header-indent-renderer", "../renderer/detail-header-indent-renderer", "../renderer/detail-expand-cell-renderer"], function (require, exports, ej2_base_1, ej2_base_2, ej2_data_1, value_formatter_1, enum_1, data_1, row_1, cell_1, events, util_1, content_renderer_1, header_renderer_1, cell_renderer_1, header_cell_renderer_1, stacked_cell_renderer_1, indent_cell_renderer_1, caption_cell_renderer_1, expand_cell_renderer_1, header_indent_renderer_1, detail_header_indent_renderer_1, detail_expand_cell_renderer_1) {
             if (!len && e.count && gObj.allowPaging) {
+                gObj.prevPageMoving = true;
                 gObj.pageSettings.totalRecordsCount = e.count;
@@ -341,4 +342,11 @@ gObj.pageSettings.currentPage = Math.ceil(e.count / gObj.pageSettings.pageSize);
                         types.forEach(function (type) {
-                            var key = column.field + ' - ' + type;
-                            element.aggregates[key] = util_1.calculateAggregate(type, itemGroup.level ? uGroupItem.records : uGroup.items, column);
+                            var key = column.field + ' - ' + type.toLowerCase();
+                            var data = itemGroup.level ? uGroupItem.records : uGroup.items;
+                            var context = _this.parent;
+                            if (type === 'Custom') {
+                                element.aggregates[key] = column.customAggregate ? column.customAggregate.call(context, data, column) : '';
+                            }
+                            else {
+                                element.aggregates[key] = ej2_data_1.DataUtil.aggregates[type.toLowerCase()](data, column.field);
+                            }
                         });
@@ -345,0 +353,0 @@ });

src/grid/renderer/row-renderer.js

@@ -87,3 +87,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/constant", "../base/util", "../base/enum", "./cell-merge-renderer"], function (require, exports, ej2_base_1, ej2_base_2, constant_1, util_1, enum_1, cell_merge_renderer_1) {
             }
-            else if (this.parent.rowHeight) {
+            else if (this.parent.rowHeight && tr.querySelector('.e-headercell')) {
                 tr.style.height = this.parent.rowHeight + 'px';
@@ -94,2 +94,15 @@ }
             }
+            if (this.parent.element.scrollHeight > this.parent.height && this.parent.aggregates.length) {
+                for (var i = 0; i < this.parent.aggregates.length; i++) {
+                    var property = 'properties';
+                    var column = 'columns';
+                    if (this.parent.aggregates[i][property][column][0].footerTemplate) {
+                        var summarycell = tr.querySelectorAll('.e-summarycell');
+                        if (summarycell.length) {
+                            var lastSummaryCell = (summarycell[summarycell.length - 1]);
+                            ej2_base_1.addClass([lastSummaryCell], ['e-lastsummarycell']);
+                        }
+                    }
+                }
+            }
             return tr;
@@ -96,0 +109,0 @@ };

src/grid/renderer/stacked-cell-renderer.js

@@ -11,3 +11,3 @@ var __extends = (this && this.__extends) || (function () {
 })();
-define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "./cell-renderer"], function (require, exports, ej2_base_1, ej2_base_2, cell_renderer_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "./cell-renderer", "../base/constant"], function (require, exports, ej2_base_1, ej2_base_2, cell_renderer_1, constant_1) {
     "use strict";
@@ -41,2 +41,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
             node.setAttribute('aria-rowspan', '1');
+            this.parent.trigger(constant_1.headerCellInfo, { cell: cell, node: node });
             return node;
@@ -43,0 +44,0 @@ };

src/grid/renderer/virtual-content-renderer.d.ts

@@ -18,2 +18,3 @@ import { IGrid, IRenderer, NotifyArgs, VirtualInfo, IModelGenerator } from '../base/interface';
     private prevInfo;
+    private currentInfo;
     private vgenerator;
@@ -48,3 +49,2 @@ private header;
     isEndBlock(index: number): boolean;
-    private getRowHeight();
     getTotalBlocks(): number;
@@ -51,0 +51,0 @@ getColumnOffset(block: number): number;

src/grid/renderer/virtual-content-renderer.js

@@ -11,3 +11,3 @@ var __extends = (this && this.__extends) || (function () {
 })();
-define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../base/util", "../base/constant", "../base/enum", "./content-renderer", "./header-renderer", "../services/intersection-observer", "../services/virtual-row-model-generator"], function (require, exports, ej2_base_1, ej2_base_2, ej2_base_3, ej2_data_1, util_1, constant_1, enum_1, content_renderer_1, header_renderer_1, intersection_observer_1, virtual_row_model_generator_1) {
+define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "@syncfusion/ej2-data", "../base/constant", "../base/enum", "./content-renderer", "./header-renderer", "../services/intersection-observer", "../services/virtual-row-model-generator"], function (require, exports, ej2_base_1, ej2_base_2, ej2_data_1, constant_1, enum_1, content_renderer_1, header_renderer_1, intersection_observer_1, virtual_row_model_generator_1) {
     "use strict";
@@ -20,2 +20,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
             _this.prevHeight = 0;
+            _this.currentInfo = {};
             _this.preventEvent = false;
@@ -59,3 +60,3 @@ _this.actions = ['filtering', 'searching', 'grouping', 'ungrouping'];
             var info = scrollArgs.sentinel;
-            var viewInfo = this.getInfoFromView(scrollArgs.direction, info, scrollArgs.offset);
+            var viewInfo = this.currentInfo = this.getInfoFromView(scrollArgs.direction, info, scrollArgs.offset);
             if (this.prevInfo && ((info.axis === 'Y' && this.prevInfo.blockIndexes.toString() === viewInfo.blockIndexes.toString())
@@ -120,3 +121,4 @@ || (info.axis === 'X' && this.prevInfo.columnIndexes.toString() === viewInfo.columnIndexes.toString()))) {
         VirtualContentRenderer.prototype.appendContent = function (target, newChild, e) {
-            var info = e.virtualInfo;
+            var info = e.virtualInfo.sentinelInfo && e.virtualInfo.sentinelInfo.axis === 'Y' && this.currentInfo.page &&
+                this.currentInfo.page !== e.virtualInfo.page ? this.currentInfo : e.virtualInfo;
             this.prevInfo = this.prevInfo || e.virtualInfo;
@@ -140,3 +142,5 @@ var cBlock = (info.columnIndexes[0]) - 1;
             }
-            this.virtualEle.setWrapperWidth(width, this.parent.enableColumnVirtualization || ej2_base_2.Browser.isIE);
+            this.virtualEle.setWrapperWidth(width, this.parent.enableColumnVirtualization);
+            ej2_base_1.remove(target);
+            target = ej2_base_1.createElement('tbody');
             target.appendChild(newChild);
@@ -160,3 +164,3 @@ this.getTable().appendChild(target);
         VirtualContentRenderer.prototype.onDataReady = function (e) {
-            if (!ej2_base_3.isNullOrUndefined(e.count)) {
+            if (!ej2_base_2.isNullOrUndefined(e.count)) {
                 this.count = e.count;
@@ -166,3 +170,6 @@ this.maxPage = Math.ceil(e.count / this.parent.pageSettings.pageSize);
             this.vgenerator.checkAndResetCache(e.requestType);
-            this.refreshOffsets();
+            if (['refresh', 'filtering', 'searching', 'grouping', 'ungrouping', 'reorder', undefined]
+                .some(function (value) { return e.requestType === value; })) {
+                this.refreshOffsets();
+            }
             this.setVirtualHeight();
@@ -216,3 +223,3 @@ this.resetScrollPosition(e.requestType);
         VirtualContentRenderer.prototype.getOffset = function (block) {
-            return Math.min(this.offsets[block] | 0, this.offsets[this.maxBlock]);
+            return Math.min(this.offsets[block] | 0, this.offsets[this.maxBlock] | 0);
         };
@@ -248,3 +255,3 @@ VirtualContentRenderer.prototype.onEntered = function () {
         VirtualContentRenderer.prototype.getBlockHeight = function () {
-            return this.getBlockSize() * this.getRowHeight();
+            return this.getBlockSize() * this.parent.getRowHeight();
         };
@@ -255,5 +262,2 @@ VirtualContentRenderer.prototype.isEndBlock = function (index) {
         };
-        VirtualContentRenderer.prototype.getRowHeight = function () {
-            return this.parent.rowHeight ? this.parent.rowHeight : util_1.getRowHeight();
-        };
         VirtualContentRenderer.prototype.getTotalBlocks = function () {
@@ -303,3 +307,3 @@ return Math.ceil(this.count / this.getBlockSize());
                 var size = block in _this.vgenerator.cache ?
-                    tmp * _this.getRowHeight() : rem && block === total ? rem * _this.getRowHeight() : _this.getBlockHeight();
+                    tmp * _this.parent.getRowHeight() : rem && block === total ? rem * _this.parent.getRowHeight() : _this.getBlockHeight();
                 _this.offsets[block] = (_this.offsets[block - 1] | 0) + size;
@@ -306,0 +310,0 @@ _this.tmpOffsets[block] = _this.offsets[block - 1] | 0;

src/grid/services/focus-strategy.d.ts

@@ -25,2 +25,3 @@ import { KeyboardEventArgs } from '@syncfusion/ej2-base';
     private prevIndexes;
+    private focusedColumnUid;
     constructor(parent: IGrid);
@@ -27,0 +28,0 @@ protected focusCheck(e: Event): void;

src/grid/services/focus-strategy.js

@@ -201,2 +201,3 @@ var __extends = (this && this.__extends) || (function () {
             this.prevIndexes = { rowIndex: rowIndex, cellIndex: cellIndex };
+            this.focusedColumnUid = this.parent.getColumnByIndex(cellIndex).uid;
             this.focusByClick = false;
@@ -230,2 +231,16 @@ };
                 }
+                if (e && e.args && e.args.requestType === 'virtualscroll') {
+                    if (_this.currentInfo.uid) {
+                        var index_1;
+                        var bool = e.rows.some(function (row, i) {
+                            index_1 = i;
+                            return row.uid === _this.currentInfo.uid;
+                        });
+                        if (bool) {
+                            _this.content.matrix.current[0] = index_1;
+                            _this.content.matrix.current[1] = _this.parent.getColumnIndexByUid(_this.focusedColumnUid) || 0;
+                            _this.focus();
+                        }
+                    }
+                }
             };
@@ -479,3 +494,3 @@ };
             this.matrix.current = [rowIndex, cellIndex];
-            info.element = this.getTable().rows[rowIndex].cells[cellIndex];
+            info.element = !ej2_base_1.isNullOrUndefined(this.getTable().rows[rowIndex]) ? this.getTable().rows[rowIndex].cells[cellIndex] : null;
             if (!info.element) {
@@ -487,2 +502,3 @@ return info;
             info.outline = true;
+            info.uid = info.element.parentElement.getAttribute('data-uid');
             return info;
@@ -634,12 +650,12 @@ };
             if (previous === void 0) { previous = []; }
-            var current = [];
+            var current1 = [];
             if (action === 'upArrow' || action === 'shiftEnter') {
-                current[0] = this.matrix.matrix.length;
-                current[1] = previous[1];
+                current1[0] = this.matrix.matrix.length;
+                current1[1] = previous[1];
             }
             else if (action === 'rightArrow' || action === 'tab') {
-                current[0] = previous[0];
-                current[1] = -1;
+                current1[0] = previous[0];
+                current1[1] = -1;
             }
-            return current;
+            return current1;
         };
@@ -695,12 +711,12 @@ HeaderFocus.prototype.generateRows = function (rows) {
             if (previous === void 0) { previous = []; }
-            var current = [];
+            var current2 = [];
             if (action === 'leftArrow' || action === 'shiftTab') {
-                current[0] = previous[0];
-                current[1] = active.matrix.columns + 1;
+                current2[0] = previous[0];
+                current2[1] = active.matrix.columns + 1;
             }
             else if (action === 'downArrow' || action === 'enter') {
-                current[0] = -1;
-                current[1] = previous[1];
+                current2[0] = -1;
+                current2[1] = previous[1];
             }
-            return current;
+            return current2;
         };
@@ -729,12 +745,12 @@ return FixedContentFocus;
             if (previous === void 0) { previous = []; }
-            var current = [];
+            var current3 = [];
             if (action === 'leftArrow' || action === 'shiftTab') {
-                current[0] = previous[0];
-                current[1] = active.matrix.columns + 1;
+                current3[0] = previous[0];
+                current3[1] = active.matrix.columns + 1;
             }
             else if (action === 'upArrow' || action === 'shiftEnter') {
-                current[0] = this.matrix.matrix.length;
-                current[1] = previous[1];
+                current3[0] = this.matrix.matrix.length;
+                current3[1] = previous[1];
             }
-            return current;
+            return current3;
         };
@@ -741,0 +757,0 @@ return FixedHeaderFocus;

src/grid/services/intersection-observer.js

@@ -77,3 +77,3 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base"], function (require, exports, ej2_base_1, ej2_base_2) {
                 if (check) {
-                    var fn = _this.fromWheel ? _this.options.debounceEvent ? debounced100 : callback : debounced100;
+                    var fn = debounced100;
                     if (current.axis === 'X') {
@@ -80,0 +80,0 @@ fn = debounced50;

src/grid/services/summary-model-generator.d.ts

@@ -24,3 +24,3 @@ import { IModelGenerator, IGrid } from '../base/interface';
     getGeneratedRow(summaryRow: AggregateRowModel, data: Object, raw: number, start: number, end: number): Row<AggregateColumnModel>;
-    getGeneratedCell(column: Column, summaryRow: AggregateRowModel, cellType?: CellType, indent?: string): Cell<AggregateColumnModel>;
+    getGeneratedCell(column: Column, summaryRow: AggregateRowModel, cellType?: CellType, indent?: string, isDetailGridAlone?: boolean): Cell<AggregateColumnModel>;
     private buildSummaryData(data, args?);
@@ -27,0 +27,0 @@ protected getIndentByLevel(data?: number): string[];

src/grid/services/summary-model-generator.js

@@ -40,3 +40,3 @@ var __extends = (this && this.__extends) || (function () {
             }
-            if (this.parent.detailTemplate) {
+            if (this.parent.detailTemplate || !ej2_base_1.isNullOrUndefined(this.parent.childGrid)) {
                 columns.push(new column_1.Column({}));
@@ -63,4 +63,6 @@ }
             var indents = this.getIndentByLevel(raw);
-            var indentLength = this.parent.groupSettings.columns.length + (this.parent.detailTemplate ? 1 : 0);
-            this.getColumns(start, end).forEach(function (value, index) { return tmp.push(_this.getGeneratedCell(value, summaryRow, index >= indentLength ? _this.getCellType() : enum_1.CellType.Indent, indents[index])); });
+            var isDetailGridAlone = !ej2_base_1.isNullOrUndefined(this.parent.childGrid);
+            var indentLength = this.parent.groupSettings.columns.length + (this.parent.detailTemplate ||
+                !ej2_base_1.isNullOrUndefined(this.parent.childGrid) ? 1 : 0);
+            this.getColumns(start, end).forEach(function (value, index) { return tmp.push(_this.getGeneratedCell(value, summaryRow, index >= indentLength ? _this.getCellType() : enum_1.CellType.Indent, indents[index], isDetailGridAlone)); });
             var row = new row_1.Row({ data: data, attributes: { class: 'e-summaryrow' } });
@@ -71,3 +73,3 @@ row.cells = tmp;
         };
-        SummaryModelGenerator.prototype.getGeneratedCell = function (column, summaryRow, cellType, indent) {
+        SummaryModelGenerator.prototype.getGeneratedCell = function (column, summaryRow, cellType, indent, isDetailGridAlone) {
             var sColumn = summaryRow.columns.filter(function (scolumn) { return scolumn.columnName === column.field; })[0];
@@ -78,2 +80,5 @@ var attrs = { 'style': { 'textAlign': column.textAlign } };
             }
+            if (ej2_base_1.isNullOrUndefined(indent) && isDetailGridAlone) {
+                attrs.class = 'e-detailindentcelltop';
+            }
             var opt = {
@@ -80,0 +85,0 @@ 'visible': column.visible,

src/grid/services/width-controller.js

@@ -145,2 +145,5 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-base", "../base/constant", "../models/column"], function (require, exports, ej2_base_1, ej2_base_2, constant_1, column_1) {
             else {
+                if (this.parent.detailTemplate || this.parent.childGrid) {
+                    this.setColumnWidth(new column_1.Column({ width: '30px' }));
+                }
                 this.parent.getHeaderTable().style.width = tWidth;
@@ -147,0 +150,0 @@ this.parent.getContentTable().style.width = tWidth;

src/pager/pager-dropdown.d.ts

@@ -32,3 +32,3 @@ import { Pager } from './pager';
     private onChange(e);
-    setDropDownValue(prop: string, value: string | number): void;
+    setDropDownValue(prop: string, value: string | number | Object | boolean): void;
     /**
@@ -35,0 +35,0 @@ * To destroy the Pagerdropdown

src/pager/pager-dropdown.js

@@ -42,4 +42,4 @@ define(["require", "exports", "@syncfusion/ej2-base", "@syncfusion/ej2-dropdowns"], function (require, exports, ej2_base_1, ej2_dropdowns_1) {
         PagerDropDown.prototype.setDropDownValue = function (prop, value) {
-            if (prop === 'value') {
-                this.dropDownListObject.value = value;
+            if (this.dropDownListObject) {
+                this.dropDownListObject[prop] = value;
             }
@@ -46,0 +46,0 @@ };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

28117445

decreased by-19.87%

Dependency count

14

increased by7.69%

Number of package files

324

decreased by-16.71%

Lines of code

276458

decreased by-15.51%

Dependency changes

• + Added@syncfusion/ej2-splitbuttons@~16.2.41

• + Added@syncfusion/ej2-base@16.2.50(transitive)

• + Added@syncfusion/ej2-buttons@16.2.50(transitive)

• + Added@syncfusion/ej2-calendars@16.2.53(transitive)

• + Added@syncfusion/ej2-compression@16.2.50(transitive)

• + Added@syncfusion/ej2-data@16.2.52(transitive)

• + Added@syncfusion/ej2-dropdowns@16.2.50(transitive)

• + Added@syncfusion/ej2-excel-export@16.2.50(transitive)

• + Added@syncfusion/ej2-file-utils@16.2.50(transitive)

• + Added@syncfusion/ej2-inputs@16.2.53(transitive)

• + Added@syncfusion/ej2-lists@16.2.50(transitive)

• + Added@syncfusion/ej2-navigations@16.2.50(transitive)

• + Added@syncfusion/ej2-pdf-export@16.2.50(transitive)

• + Added@syncfusion/ej2-popups@16.2.52(transitive)

• + Added@syncfusion/ej2-splitbuttons@16.2.50(transitive)

• - Removed@syncfusion/ej2-base@16.1.38(transitive)

• - Removed@syncfusion/ej2-buttons@16.1.48(transitive)

• - Removed@syncfusion/ej2-calendars@16.1.49(transitive)

• - Removed@syncfusion/ej2-compression@16.1.37(transitive)

• - Removed@syncfusion/ej2-data@16.1.42(transitive)

• - Removed@syncfusion/ej2-dropdowns@16.1.46(transitive)

• - Removed@syncfusion/ej2-excel-export@16.1.37(transitive)

• - Removed@syncfusion/ej2-file-utils@16.1.37(transitive)

• - Removed@syncfusion/ej2-inputs@16.1.48(transitive)

• - Removed@syncfusion/ej2-lists@16.1.42(transitive)

• - Removed@syncfusion/ej2-navigations@16.1.42(transitive)

• - Removed@syncfusion/ej2-pdf-export@16.1.37(transitive)

• - Removed@syncfusion/ej2-popups@16.1.47(transitive)

• Updated@syncfusion/ej2-base@~16.2.41

• Updated@syncfusion/ej2-buttons@~16.2.41

• Updated@syncfusion/ej2-calendars@~16.2.41

• Updated@syncfusion/ej2-compression@~16.2.41

• Updated@syncfusion/ej2-data@~16.2.41

• Updated@syncfusion/ej2-dropdowns@~16.2.41

• Updated@syncfusion/ej2-excel-export@~16.2.41

• Updated@syncfusion/ej2-file-utils@~16.2.41

• Updated@syncfusion/ej2-inputs@~16.2.41

• Updated@syncfusion/ej2-lists@~16.2.41

• Updated@syncfusion/ej2-navigations@~16.2.41

• Updated@syncfusion/ej2-pdf-export@~16.2.41

• Updated@syncfusion/ej2-popups@~16.2.41