@syncfusion/ej2-treegrid 20.1.55 → 20.1.56-97113

package/src/treegrid/actions/filter.js

@@ -73,7 +73,7 @@ var Filter = /** @class */ (function () {
         this.filteredResult = [];
         this.isHierarchyFilter = false;
         for (var f = 0; f < this.flatFilteredData.length; f++) {
-            var rec = this.flatFilteredData[f];
+            var rec = this.flatFilteredData[parseInt(f.toString(), 10)];
             this.addParentRecord(rec);
             var hierarchyMode = this.parent.grid.searchSettings.key === '' ? this.parent.filterSettings.hierarchyMode
                 : this.parent.searchSettings.hierarchyMode;
@@ -155,9 +155,6 @@ var Filter = /** @class */ (function () {
                     }
                 }
                 else {
-                    if (parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1 && isNullOrUndefined(this.parent['dataResults']['action'])) {
-                        this.parent.expandRow(this.parent.getRows()[parent['index']], parent);
-                    }
                     this.addParentRecord(parent);
                 }
             }
@@ -171,27 +168,27 @@ var Filter = /** @class */ (function () {
         var childRec = getObject('childRecords', records);
         var isExist = false;
         for (var count = 0; count < childRec.length; count++) {
-            var ischild = childRec[count].childRecords;
+            var ischild = childRec[parseInt(count.toString(), 10)].childRecords;
             var hierarchyMode = this.parent.grid.searchSettings.key === '' ?
                 this.parent.filterSettings.hierarchyMode : this.parent.searchSettings.hierarchyMode;
             if (((hierarchyMode === 'Child' || hierarchyMode === 'Both') && (this.parent.grid.filterSettings.columns.length !== 0
                 || this.parent.grid.searchSettings.key !== ''))) {
                 var uniqueIDValue = getValue('uniqueIDFilterCollection', this.parent);
-                if (!Object.prototype.hasOwnProperty.call(uniqueIDValue, childRec[count].uniqueID)) {
-                    this.filteredResult.push(childRec[count]);
-                    setValue('uniqueIDFilterCollection.' + childRec[count].uniqueID, childRec[count], this.parent);
+                if (!Object.prototype.hasOwnProperty.call(uniqueIDValue, childRec[parseInt(count.toString(), 10)].uniqueID)) {
+                    this.filteredResult.push(childRec[parseInt(count.toString(), 10)]);
+                    setValue('uniqueIDFilterCollection.' + childRec[parseInt(count.toString(), 10)].uniqueID, childRec[parseInt(count.toString(), 10)], this.parent);
                     isExist = true;
                 }
             }
             if ((hierarchyMode === 'None')
                 && (this.parent.grid.filterSettings.columns.length !== 0 || this.parent.grid.searchSettings.key !== '')) {
-                if (this.flatFilteredData.indexOf(childRec[count]) !== -1) {
+                if (this.flatFilteredData.indexOf(childRec[parseInt(count.toString(), 10)]) !== -1) {
                     isExist = true;
                     break;
                 }
             }
             if (!isNullOrUndefined(ischild) && ischild.length) {
-                isExist = this.checkChildExsist(childRec[count]);
+                isExist = this.checkChildExsist(childRec[parseInt(count.toString(), 10)]);
             }
             if ((hierarchyMode === 'Child' || hierarchyMode === 'Both') && childRec.length) {
                 isExist = true;
@@ -203,15 +200,15 @@ var Filter = /** @class */ (function () {
         var record = this.filteredResult;
         var len = this.filteredResult.length;
         for (var c = 0; c < len; c++) {
-            var parent_2 = getParentData(this.parent, record[c].parentUniqueID);
+            var parent_2 = getParentData(this.parent, record[parseInt(c.toString(), 10)].parentUniqueID);
             var isPrst = record.indexOf(parent_2) !== -1;
             if (isPrst) {
-                var parent_3 = getParentData(this.parent, record[c].parentUniqueID, true);
-                record[c].filterLevel = parent_3.filterLevel + 1;
+                var parent_3 = getParentData(this.parent, record[parseInt(c.toString(), 10)].parentUniqueID, true);
+                record[parseInt(c.toString(), 10)].filterLevel = parent_3.filterLevel + 1;
             }
             else {
-                record[c].filterLevel = 0;
-                this.filteredParentRecs.push(record[c]);
+                record[parseInt(c.toString(), 10)].filterLevel = 0;
+                this.filteredParentRecs.push(record[parseInt(c.toString(), 10)]);
             }
         }
     };
@@ -221,7 +218,7 @@ var Filter = /** @class */ (function () {
         var len = flatData.length;
         var currentRecord;
         for (count; count < len; count++) {
-            currentRecord = flatData[count];
+            currentRecord = flatData[parseInt(count.toString(), 10)];
             var fLevel = currentRecord.filterLevel;
             if (fLevel || fLevel === 0 || !isNullOrUndefined(currentRecord.hasFilteredChildRecords)) {
                 currentRecord.hasFilteredChildRecords = null;

package/src/treegrid/actions/freeze-column.d.ts

@@ -14,6 +14,7 @@ export declare class Freeze {
     constructor(parent?: TreeGrid);
     addEventListener(): void;
     removeEventListener(): void;
+    protected instantiateRenderer(): void;
     private rowExpandCollapse;
     private dblClickHandler;
     private dataBoundArg;

package/src/treegrid/actions/freeze-column.js

@@ -1,6 +1,7 @@
-import { parentsUntil } from '@syncfusion/ej2-grids';
+import { ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, FreezeContentRender, FreezeRender, parentsUntil, RenderType } from '@syncfusion/ej2-grids';
 import { Grid, Freeze as FreezeColumn } from '@syncfusion/ej2-grids';
-import { addClass } from '@syncfusion/ej2-base';
+import { addClass, getValue } from '@syncfusion/ej2-base';
+import { ColumnVirtualTreeFreezeRenderer, VirtualTreeFreezeRenderer, VirtualTreeFreezeHdrRenderer } from '../renderer/virtual-tree-freeze-render';
 /**
  * TreeGrid Freeze module
  *
@@ -21,6 +22,7 @@ var Freeze = /** @class */ (function () {
         this.parent.on('rowExpandCollapse', this.rowExpandCollapse, this);
         this.parent.on('dataBoundArg', this.dataBoundArg, this);
         this.parent.grid.on('dblclick', this.dblClickHandler, this);
+        this.parent.grid.on('initial-load', this.instantiateRenderer, this);
     };
     Freeze.prototype.removeEventListener = function () {
         if (this.parent.isDestroyed) {
@@ -29,6 +31,40 @@ var Freeze = /** @class */ (function () {
         this.parent.off('rowExpandCollapse', this.rowExpandCollapse);
         this.parent.off('dataBoundArg', this.dataBoundArg);
         this.parent.grid.off('dblclick', this.dblClickHandler);
+        this.parent.grid.off('initial-load', this.instantiateRenderer);
+    };
+    Freeze.prototype.instantiateRenderer = function () {
+        var renderer = getValue('serviceLocator', this.parent.grid).getService('rendererFactory');
+        if (this.parent.getFrozenColumns()) {
+            if (this.parent.enableColumnVirtualization) {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Header, new VirtualTreeFreezeHdrRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+            else {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Header, new FreezeRender(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+            if (this.parent.enableVirtualization) {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Content, new VirtualTreeFreezeRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+            else {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Content, new FreezeContentRender(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+        }
+        if (this.parent.getFrozenLeftColumnsCount() || this.parent.getFrozenRightColumnsCount()) {
+            getValue('addRenderer', renderer)
+                .apply(renderer, [RenderType.Header, new ColumnFreezeHeaderRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            if (this.parent.enableVirtualization) {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Content, new ColumnVirtualTreeFreezeRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+            else {
+                getValue('addRenderer', renderer)
+                    .apply(renderer, [RenderType.Content, new ColumnFreezeContentRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
+            }
+        }
     };
     Freeze.prototype.rowExpandCollapse = function (args) {
         var movableRows = this.parent.getMovableDataRows();
@@ -51,29 +87,30 @@ var Freeze = /** @class */ (function () {
             rows = args.detailrows;
         }
         for (var i = 0; i < rows.length; i++) {
-            var rData = this.parent.grid.getRowObjectFromUID(rows[i].getAttribute('data-Uid')).data;
-            rows[i].style.display = args.action;
-            if (freeze) {
-                frozenRightRows[i].style.display = args.action;
+            var rData = this.parent.grid.getRowObjectFromUID(rows[parseInt(i.toString(), 10)].getAttribute('data-Uid')).data;
+            rows[parseInt(i.toString(), 10)].style.display = args.action;
+            if (freeze && frozenRightRows.length) {
+                frozenRightRows[parseInt(i.toString(), 10)].style.display = args.action;
             }
             var queryselector = args.action === 'none' ? '.e-treecolumn-container .e-treegridcollapse'
                 : '.e-treecolumn-container .e-treegridexpand';
-            if (frozenrows[rows[i].rowIndex].querySelector(queryselector)) {
+            if (frozenrows[rows[parseInt(i.toString(), 10)].rowIndex].querySelector(queryselector)) {
                 var cRow = [];
                 for (var i_1 = 0; i_1 < movableRows.length; i_1++) {
-                    if (movableRows[i_1].querySelector('.e-gridrowindex' + rData.index + 'level' + (rData.level + 1))) {
-                        cRow.push(movableRows[i_1]);
+                    if (movableRows[parseInt(i_1.toString(), 10)].querySelector('.e-gridrowindex' + rData.index + 'level' + (rData.level + 1))) {
+                        cRow.push(movableRows[parseInt(i_1.toString(), 10)]);
                     }
                 }
                 if (cRow.length) {
-                    this.rowExpandCollapse({ detailrows: cRow, action: args.action });
+                    var data = this.parent.getCurrentViewRecords()[cRow[0].rowIndex];
+                    this.rowExpandCollapse({ detailrows: cRow, action: args.action, record: data });
                 }
             }
         }
     };
     Freeze.prototype.dblClickHandler = function (e) {
         if (parentsUntil(e.target, 'e-rowcell') &&
-            this.parent.grid.editSettings.allowEditOnDblClick && this.parent.editSettings.mode !== 'Cell') {
+            this.parent.grid.editSettings.allowEditOnDblClick && this.parent.editSettings.mode !== 'Cell' && (!e.target['classList'].contains('e-treegridcollapse') && !e.target['classList'].contains('e-treegridexpand'))) {
             this.parent.grid.editModule.startEdit(parentsUntil(e.target, 'e-row'));
         }
     };

package/src/treegrid/actions/infinite-scroll.js

@@ -70,25 +70,25 @@ var InfiniteScroll = /** @class */ (function () {
         var rowObjects = this.parent.grid.getRowsObject();
         var locator = 'serviceLocator';
         var generateRows = 'generateRows';
-        var serviceLocator = this.parent.grid.infiniteScrollModule[locator];
+        var serviceLocator = this.parent.grid.infiniteScrollModule["" + locator];
         var rowRenderer = new RowRenderer(serviceLocator, null, this.parent.grid);
         var rows = this.parent.getRows();
         var position = args.index === rows.length - 1 ? 'after' : 'before';
         var cols = this.parent.grid.getColumns();
-        var childRowObjects = this.parent.grid.infiniteScrollModule[generateRows](args.childData, args);
+        var childRowObjects = this.parent.grid.infiniteScrollModule["" + generateRows](args.childData, args);
         var childRowElements = [];
         for (var i = 0; i < childRowObjects.length; i++) {
-            childRowElements.push(rowRenderer.render(childRowObjects[i], cols));
+            childRowElements.push(rowRenderer.render(childRowObjects[parseInt(i.toString(), 10)], cols));
         }
         rowObjects.splice.apply(rowObjects, [args.index + 1, 0].concat(childRowObjects));
         for (var i = 0; i < childRowElements.length; i++) {
             if (position === 'after') {
-                rows[args.index + i][position](childRowElements[i]);
+                rows[args.index + i]["" + position](childRowElements[parseInt(i.toString(), 10)]);
             }
             else {
-                rows[args.index + i + 1][position](childRowElements[i]);
+                rows[args.index + i + 1]["" + position](childRowElements[parseInt(i.toString(), 10)]);
             }
-            rows.splice(args.index + 1 + i, 0, childRowElements[i]);
+            rows.splice(args.index + 1 + i, 0, childRowElements[parseInt(i.toString(), 10)]);
         }
         resetRowIndex(this.parent.grid, this.parent.grid.getRowsObject(), this.parent.grid.getRows(), 0);
     };
@@ -100,9 +100,9 @@ var InfiniteScroll = /** @class */ (function () {
     InfiniteScroll.prototype.contentready = function () {
         if (this.parent.infiniteScrollSettings.enableCache && !isNullOrUndefined(this.parent.editModule)) {
             var updateIndex = 'updateIndex';
-            this.parent.editModule[updateIndex](this.parent.grid.dataSource, this.parent.getRows(), this.parent.getCurrentViewRecords());
+            this.parent.editModule["" + updateIndex](this.parent.grid.dataSource, this.parent.getRows(), this.parent.getCurrentViewRecords());
             if (this.parent.getFrozenColumns()) {
-                this.parent.editModule[updateIndex](this.parent.grid.dataSource, this.parent.getMovableDataRows(), this.parent.getCurrentViewRecords());
+                this.parent.editModule["" + updateIndex](this.parent.grid.dataSource, this.parent.getMovableDataRows(), this.parent.getCurrentViewRecords());
             }
         }
     };
@@ -137,6 +137,9 @@ var InfiniteScroll = /** @class */ (function () {
         });
         var actionArgs = getValue('actionArgs', pageingDetails.actionArgs);
         var actions = getValue('actions', this.parent.grid.infiniteScrollModule);
+        if (this.parent.grid.infiniteScrollModule['isInitialRender'] && !this.parent.initialRender) {
+            this.parent.grid.pageSettings.currentPage = 1;
+        }
         var initial = actions.some(function (value) { return value === actionArgs.requestType; });
         var initialRender = initial ? true : this.parent.initialRender ? true : false;
         this.visualData = visualData;
@@ -151,8 +154,8 @@ var InfiniteScroll = /** @class */ (function () {
                 this.parent.infiniteScrollSettings.initialBlocks = this.parent.infiniteScrollSettings.maxBlocks;
             }
             var size = initialRender ?
-                this.parent.pageSettings.pageSize * this.parent.infiniteScrollSettings.initialBlocks :
-                this.parent.pageSettings.pageSize;
+                this.parent.grid.pageSettings.pageSize * this.parent.infiniteScrollSettings.initialBlocks :
+                this.parent.grid.pageSettings.pageSize;
             var current = this.parent.grid.pageSettings.currentPage;
             if (!isNullOrUndefined(actionArgs)) {
                 var lastIndex = getValue('lastIndex', this.parent.grid.infiniteScrollModule);
@@ -170,7 +173,7 @@ var InfiniteScroll = /** @class */ (function () {
                 else {
                     if ((pageingDetails.actionArgs['action'] === 'expand' || pageingDetails.actionArgs['action'] === 'collapse') && this.parent.grid.pageSettings.currentPage !== 1) {
                         current = 1;
-                        size = this.parent.pageSettings.pageSize * this.parent.grid.pageSettings.currentPage;
+                        size = this.parent.grid.pageSettings.pageSize * this.parent.grid.pageSettings.currentPage;
                     }
                     query = query.page(current, size);
                 }
@@ -198,11 +201,11 @@ var InfiniteScroll = /** @class */ (function () {
      */
     InfiniteScroll.prototype.infiniteEditHandler = function (args) {
         var infiniteData = 'infiniteCurrentViewData';
-        var infiniteCurrentViewData = this.parent.grid.infiniteScrollModule[infiniteData];
+        var infiniteCurrentViewData = this.parent.grid.infiniteScrollModule["" + infiniteData];
         var keys = Object.keys(infiniteCurrentViewData);
         if (args.e.requestType === 'delete' && args.result.length > 1) {
             for (var i = 1; i < args.result.length; i++) {
-                infiniteCurrentViewData[keys[keys.length - 1]].push(args.result[i]);
+                infiniteCurrentViewData[keys[keys.length - 1]].push(args.result[parseInt(i.toString(), 10)]);
             }
         }
     };
@@ -241,13 +244,13 @@ var InfiniteScroll = /** @class */ (function () {
         var resetInfiniteCurrentViewData = 'resetInfiniteCurrentViewData';
         var _loop_1 = function (i) {
             rows.filter(function (e, index) {
-                if (e.data[keyField] === data[i][keyField]) {
+                if (e.data["" + keyField] === data[parseInt(i.toString(), 10)]["" + keyField]) {
                     if (isFrozen) {
                         var page = Math.ceil((index + 1) / _this.parent.grid.pageSettings.pageSize);
-                        _this.parent.grid.infiniteScrollModule[resetInfiniteCurrentViewData](page, index);
+                        _this.parent.grid.infiniteScrollModule["" + resetInfiniteCurrentViewData](page, index);
                     }
                     rows.splice(index, 1);
-                    remove(rowElms[index]);
+                    remove(rowElms[parseInt(index.toString(), 10)]);
                     rowElms.splice(index, 1);
                 }
             });
@@ -263,7 +266,7 @@ var InfiniteScroll = /** @class */ (function () {
         var locator = 'serviceLocator';
         var actionArgs = eventArgs.args.e;
         var row = eventArgs.row;
-        var serviceLocator = this.parent.grid.infiniteScrollModule[locator];
+        var serviceLocator = this.parent.grid.infiniteScrollModule["" + locator];
         var rowRenderer = new RowRenderer(serviceLocator, null, this.parent.grid);
         var tbody;
         var currentData = this.parent.getCurrentViewRecords();
@@ -287,22 +290,22 @@ var InfiniteScroll = /** @class */ (function () {
         }
         var position;
         var addRowIndex = 'addRowIndex';
-        var newRowIndex = this.parent.editModule[addRowIndex];
+        var newRowIndex = this.parent.editModule["" + addRowIndex];
         for (var i = 0; i < row.length; i++) {
-            var newRow = rowRenderer.render(row[i], this.parent.grid.getColumns());
+            var newRow = rowRenderer.render(row[parseInt(i.toString(), 10)], this.parent.grid.getColumns());
             if (actionArgs.requestType === 'save' && actionArgs.action === 'add') {
                 if (getValue('selectedIndex', this.parent.editModule) !== -1 && this.parent.editSettings.newRowPosition !== 'Top') {
                     if (this.parent.editSettings.newRowPosition === 'Below' || this.parent.editSettings.newRowPosition === 'Child') {
                         position = 'after';
-                        newRowIndex += findChildrenRecords(currentData[newRowIndex + 1]).length;
+                        newRowIndex += findChildrenRecords(currentData[parseInt(newRowIndex.toString(), 10)]).length;
                         if (this.parent.editSettings.newRowPosition === 'Child') {
                             newRowIndex -= 1; //// for child position already child record is added in childRecords so subtracting 1
                         }
-                        currentRows[newRowIndex][position](newRow);
+                        currentRows[parseInt(newRowIndex.toString(), 10)]["" + position](newRow);
                     }
                     else if (this.parent.editSettings.newRowPosition === 'Above') {
                         position = 'before';
-                        currentRows[this.parent.editModule[addRowIndex]][position](newRow);
+                        currentRows[this.parent.editModule["" + addRowIndex]]["" + position](newRow);
                     }
                 }
                 else if (this.parent.editSettings.newRowPosition === 'Bottom') {

package/src/treegrid/actions/logger.js

@@ -49,36 +49,36 @@ var Logger = /** @class */ (function (_super) {
         }
         var type = types;
         for (var i = 0; i < type.length; i++) {
-            var item = detailLists[type[i]];
+            var item = detailLists[type[parseInt(i.toString(), 10)]];
             var cOp = item.check(args, this.parent);
             if (cOp.success) {
                 var message = item.generateMessage(args, this.parent, cOp.options);
                 message = message.replace('EJ2Grid', 'EJ2TreeGrid').replace('* Hierarchy Grid', '').replace('* Grouping', '');
-                if (IsRowDDEnabled && type[i] === 'primary_column_missing') {
+                if (IsRowDDEnabled && type[parseInt(i.toString(), 10)] === 'primary_column_missing') {
                     message = message.replace('Editing', 'Row DragAndDrop');
                     IsRowDDEnabled = false;
                 }
                 var index = message.indexOf('https');
                 var gridurl = message.substring(index);
-                if (type[i] === 'module_missing') {
+                if (type[parseInt(i.toString(), 10)] === 'module_missing') {
                     message = message.replace(gridurl, DOC_URL + '/modules');
                 }
-                else if (type[i] === 'primary_column_missing' || type[i] === 'selection_key_missing') {
+                else if (type[parseInt(i.toString(), 10)] === 'primary_column_missing' || type[parseInt(i.toString(), 10)] === 'selection_key_missing') {
                     message = message.replace(gridurl, BASE_DOC_URL + '/api/treegrid/column/#isprimarykey');
                 }
-                else if (type[i] === 'grid_remote_edit') {
+                else if (type[parseInt(i.toString(), 10)] === 'grid_remote_edit') {
                     message = message.replace(gridurl, DOC_URL + '/edit');
                 }
-                else if (type[i] === 'virtual_height') {
+                else if (type[parseInt(i.toString(), 10)] === 'virtual_height') {
                     message = message.replace(gridurl, DOC_URL + '/virtual');
                 }
-                else if (type[i] === 'check_datasource_columns') {
+                else if (type[parseInt(i.toString(), 10)] === 'check_datasource_columns') {
                     message = message.replace(gridurl, DOC_URL + '/columns');
                 }
-                else if (type[i] === 'locale_missing') {
+                else if (type[parseInt(i.toString(), 10)] === 'locale_missing') {
                     message = message.replace(gridurl, DOC_URL + '/global-local/#localization');
                 }
-                if (type[i] === 'datasource_syntax_mismatch') {
+                if (type[parseInt(i.toString(), 10)] === 'datasource_syntax_mismatch') {
                     if (!isNullOrUndefined(this.treeGridObj) && !isNullOrUndefined(this.treeGridObj.dataStateChange)) {
                         // eslint-disable-next-line no-console
                         console[item.logType](message);
@@ -102,7 +102,7 @@ var Logger = /** @class */ (function (_super) {
             this.log('primary_column_missing', args);
         }
         for (var i = 0; i < type.length; i++) {
-            var item = treeGridDetails[type[i]];
+            var item = treeGridDetails[type[parseInt(i.toString(), 10)]];
             var cOp = item.check(args, treeGrid);
             if (cOp.success) {
                 var message = item.generateMessage(args, treeGrid, cOp.options);

package/src/treegrid/actions/page.d.ts

@@ -62,5 +62,6 @@ export declare class Page {
      */
     private collapseExpandPagedchilds;
     private pageRoot;
+    private updatePageSize;
     private pageAction;
 }

package/src/treegrid/actions/page.js

@@ -89,10 +89,12 @@ var Page = /** @class */ (function () {
      */
     Page.prototype.collapseExpandPagedchilds = function (rowDetails) {
         rowDetails.record.expanded = rowDetails.action === 'collapse' ? false : true;
+        this.parent.flatData.map(function (e) { return e.expanded = e.uniqueID === rowDetails.record.uniqueID &&
+            e.expanded !== rowDetails.record.expanded ? rowDetails.record.expanded : e.expanded; });
         if (this.parent.enableImmutableMode) {
             var primaryKeyField_1 = this.parent.getPrimaryKeyFieldNames()[0];
             var record = this.parent.flatData.filter(function (e) {
-                return e[primaryKeyField_1] === rowDetails.record[primaryKeyField_1];
+                return e["" + primaryKeyField_1] === rowDetails.record["" + primaryKeyField_1];
             });
             if (record.length) {
                 record[0].expanded = rowDetails.record.expanded;
@@ -110,15 +112,15 @@ var Page = /** @class */ (function () {
             var row = 'row';
             var action = 'action';
             var targetEle = void 0;
-            if (ret[action] === 'collapse') {
-                targetEle = ret[row].getElementsByClassName('e-treegridexpand')[0];
+            if (ret["" + action] === 'collapse') {
+                targetEle = ret["" + row].getElementsByClassName('e-treegridexpand')[0];
                 if (!isNullOrUndefined(targetEle)) {
                     removeClass([targetEle], 'e-treegridexpand');
                     addClass([targetEle], 'e-treegridcollapse');
                 }
             }
-            else if (ret[action] === 'expand') {
-                targetEle = ret[row].getElementsByClassName('e-treegridcollapse')[0];
+            else if (ret["" + action] === 'expand') {
+                targetEle = ret["" + row].getElementsByClassName('e-treegridcollapse')[0];
                 if (!isNullOrUndefined(targetEle)) {
                     removeClass([targetEle], 'e-treegridcollapse');
                     addClass([targetEle], 'e-treegridexpand');
@@ -129,11 +131,11 @@ var Page = /** @class */ (function () {
     Page.prototype.pageRoot = function (pagedResults, temp, result) {
         var newResults = isNullOrUndefined(result) ? [] : result;
         var _loop_1 = function (t) {
-            newResults.push(temp[t]);
+            newResults.push(temp[parseInt(t.toString(), 10)]);
             var res = [];
-            if (temp[t].hasChildRecords) {
+            if (temp[parseInt(t.toString(), 10)].hasChildRecords) {
                 res = pagedResults.filter(function (e) {
-                    return temp[t].uniqueID === e.parentUniqueID;
+                    return temp[parseInt(t.toString(), 10)].uniqueID === e.parentUniqueID;
                 });
                 newResults = this_1.pageRoot(pagedResults, res, newResults);
             }
@@ -144,6 +146,16 @@ var Page = /** @class */ (function () {
         }
         return newResults;
     };
+    Page.prototype.updatePageSize = function (pageingDetails) {
+        var updateSize = pageingDetails.result.length;
+        var gridPagerModule = this.parent.grid.pagerModule;
+        if (this.parent.pageSettings.pageSizes === true) {
+            if (gridPagerModule.pagerObj.pagerdropdownModule['dropDownListObject'].value === gridPagerModule.pagerObj.getLocalizedLabel('All')) {
+                gridPagerModule['pagerObj'].totalRecordsCount = updateSize;
+                this.parent.grid.pageSettings.pageSize = updateSize;
+            }
+        }
+    };
     Page.prototype.pageAction = function (pageingDetails) {
         var _this = this;
         var dm = new DataManager(pageingDetails.result);
@@ -180,6 +192,7 @@ var Page = /** @class */ (function () {
             pageingDetails.count = visualData.length;
             var query = new Query();
             var size = this.parent.grid.pageSettings.pageSize;
+            this.updatePageSize(pageingDetails);
             var current = this.parent.grid.pageSettings.currentPage;
             if (visualData.length < (current * size)) {
                 current = (Math.floor(visualData.length / size)) + ((visualData.length % size) ? 1 : 0);

package/src/treegrid/actions/reorder.js

@@ -48,12 +48,12 @@ var Reorder = /** @class */ (function () {
     };
     Reorder.prototype.getTreeColumn = function () {
         var columnModel = 'columnModel';
-        var treeColumn = this.parent[columnModel][this.parent.treeColumnIndex];
+        var treeColumn = this.parent["" + columnModel][this.parent.treeColumnIndex];
         var treeIndex;
         var updatedCols = this.parent.getColumns();
         for (var f = 0; f < updatedCols.length; f++) {
             var treeColumnfield = getObject('field', treeColumn);
-            var parentColumnfield = getObject('field', updatedCols[f]);
+            var parentColumnfield = getObject('field', updatedCols[parseInt(f.toString(), 10)]);
             if (treeColumnfield === parentColumnfield) {
                 treeIndex = f;
                 break;