@syncfusion/ej2-treegrid 22.2.9 → 23.1.36

package/dist/es6/ej2-treegrid.es2015.js

@@ -1,5 +1,5 @@
 import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, SanitizeHtmlHelper, addClass, classList, closest, compile, createElement, debounce, extend, getEnumValue, getValue, isNullOrUndefined, merge, remove, removeClass, select, setStyleAttribute, setValue } from '@syncfusion/ej2-base';
-import { Aggregate, Cell, CellRenderer, CellType, Clipboard, ColumnChooser, ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, ColumnMenu, ColumnVirtualFreezeRenderer, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, FreezeContentRender, FreezeRender, FreezeRowModelGenerator, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualFreezeHdrRenderer, VirtualFreezeRenderer, VirtualHeaderRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getObject, getTransformValues, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, setDebounce, templateCompiler } from '@syncfusion/ej2-grids';
+import { Aggregate, Cell, CellRenderer, CellType, Clipboard, ColumnChooser, ColumnMenu, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualHeaderRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getNumberFormat, getObject, getTransformValues, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, templateCompiler } from '@syncfusion/ej2-grids';
 import { createCheckBox } from '@syncfusion/ej2-buttons';
 import { CacheAdaptor, DataManager, DataUtil, Deferred, JsonAdaptor, ODataAdaptor, Predicate, Query, RemoteSaveAdaptor, UrlAdaptor, WebApiAdaptor, WebMethodAdaptor } from '@syncfusion/ej2-data';
 import { createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
@@ -1230,7 +1230,7 @@ class Selection {
         if (recordIndex > -1) {
             let movableTr;
             if (this.parent.frozenRows || this.parent.getFrozenColumns()) {
-                movableTr = this.parent.getMovableDataRows()[parseInt(recordIndex.toString(), 10)];
+                movableTr = this.parent.getDataRows()[parseInt(recordIndex.toString(), 10)];
             }
             checkbox = tr.querySelectorAll('.e-frame')[0] ? tr.querySelectorAll('.e-frame')[0]
                 : movableTr.querySelectorAll('.e-frame')[0];
@@ -1925,9 +1925,13 @@ class DataManipulation {
                     qry.isCountRequired = true;
                     dm.executeQuery(qry).then((e) => {
                         this.parentItems = DataUtil.distinct(e.result, this.parent.parentIdMapping, false);
-                        const req = getObject('dataSource.requests', this.parent).filter((e) => {
-                            return e.httpRequest.statusText !== 'OK';
-                        }).length;
+                        let req;
+                        if (e.result) {
+                            req = 0;
+                        }
+                        else {
+                            req = 1;
+                        }
                         if (req === 0) {
                             setValue('grid.contentModule.isLoaded', true, this.parent);
                             if (!isNullOrUndefined(this.zerothLevelData)) {
@@ -2180,7 +2184,19 @@ class DataManipulation {
             const remoteCollapsedData = 'remoteCollapsedData';
             const level = 'level';
             let datas = this.parent.grid.currentViewData.slice();
-            let inx = datas.indexOf(rowDetails.record);
+            let inx;
+            const idMapping = this.parent.idMapping;
+            if (this.parent['isGantt'] && !this.parent.loadChildOnDemand && this.parent.hasChildMapping) {
+                for (let i = 0; i < this.parent.grid.currentViewData.length; i++) {
+                    if (rowDetails.record[idMapping] === this.parent.grid.currentViewData[i][idMapping]) {
+                        inx = i;
+                        break;
+                    }
+                }
+            }
+            else {
+                inx = datas.indexOf(rowDetails.record);
+            }
             if (this.parent.enableVirtualization && (rowDetails.action === 'collapse' || rowDetails.action === 'remoteExpand')) {
                 datas = [];
                 for (let i = 0; i < inx; i++) {
@@ -3293,7 +3309,7 @@ function updateParentRow(key, record, action, control, isSelfReference, child) {
         }
         let movableRow;
         if (control.frozenRows || control.getFrozenColumns()) {
-            movableRow = control.getMovableRowByIndex(index);
+            movableRow = control.getRowByIndex(index);
         }
         if (!control.enableVirtualization && !isNullOrUndefined(row) || !isNullOrUndefined(movableRow)) {
             let index = control.treeColumnIndex;
@@ -3436,6 +3452,112 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     pdfExport(pdfExportProperties, isMultipleExport, pdfDoc, isBlob) {
         return this.pdfExportModule.Map(pdfExportProperties, isMultipleExport, pdfDoc, isBlob);
     }
+    /**
+     * Sends a post request to export tree grid to excel file in server side.
+     *
+     * @param  {string} url - Pass URL for server side excel export action.
+     * @returns {void}
+     */
+    serverExcelExport(url) {
+        this.isExcel = true;
+        this.exportTreeGrid(url);
+    }
+    /**
+     * Sends a post request to export tree grid to pdf file in server side.
+     *
+     * @param  {string} url - Pass URL for server-side pdf export action.
+     * @returns {void}
+     */
+    serverPdfExport(url) {
+        this.isExcel = false;
+        this.exportTreeGrid(url);
+    }
+    /**
+     * Sends a Post request to export Tree Grid to CSV file in server side.
+     *
+     * @param  {string} url - Pass URL for server-side csv export action.
+     * @returns {void}
+     */
+    serverCsvExport(url) {
+        this.isExcel = true;
+        this.exportTreeGrid(url);
+    }
+    /**
+     * Exports the TreeGrid data to the specified URL using a POST request.
+     * @param {string} url - Defines exporting url
+     * @returns {void}
+     */
+    exportTreeGrid(url) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const treegrid = this;
+        const query = treegrid.grid.getDataModule().generateQuery(true);
+        const state = new UrlAdaptor().processQuery(new DataManager({ url: '' }), query);
+        const queries = JSON.parse(state.data);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const treeGridModel = JSON.parse(this.addOnPersist(['allowPaging', 'pageSettings', 'sortSettings', 'allowPdfExport', 'allowExcelExport', 'aggregates',
+            'filterSettings', 'columns', 'locale', 'searchSettings', 'idMapping', 'parentIdMapping', 'childMapping', 'treeColumnIndex']));
+        const include = ['field', 'headerText', 'type', 'format', 'visible',
+            'template', 'index', 'width', 'textAlign', 'headerTextAlign', 'columns'];
+        treeGridModel.filterSettings.columns = queries.where;
+        treeGridModel.searchSettings.fields = queries.search && queries.search[0]['fields'] || [];
+        treeGridModel.sortSettings.columns = queries.sorted;
+        treeGridModel.columns = this.setHeaderText(treeGridModel.columns, include);
+        const form = this.createElement('form', { id: 'ExportForm', styles: 'display:none;' });
+        const treeGridInput = this.createElement('input', { id: 'treeGridInput', attrs: { name: 'treeGridModel' } });
+        treeGridInput.value = JSON.stringify(treeGridModel);
+        form.method = 'POST';
+        form.action = url;
+        form.appendChild(treeGridInput);
+        document.body.appendChild(form);
+        form.submit();
+        form.remove();
+    }
+    /**
+     * Sets the header text and other properties for an array of columns based on specified criteria.
+     * @param {Column[]} columns - Defines array of columns
+     * @param {string[]} include - Defines array of sting
+     * @returns {Column[]} returns array of columns
+     */
+    setHeaderText(columns, include) {
+        for (let i = 0; i < columns.length; i++) {
+            let column = this.getColumnByUid(columns[parseInt(i.toString(), 10)].uid);
+            if (this.stackedHeader && isNullOrUndefined(column)) {
+                column = !isNullOrUndefined(columns[parseInt(i.toString(), 10)].field) ?
+                    this.getColumnByField(columns[parseInt(i.toString(), 10)].field) : columns[parseInt(i.toString(), 10)];
+            }
+            columns[parseInt(i.toString(), 10)].headerText = column.headerText;
+            if (!isNullOrUndefined(column.template)) {
+                columns[parseInt(i.toString(), 10)].template = 'true';
+            }
+            if (columns[parseInt(i.toString(), 10)].format) {
+                columns[parseInt(i.toString(), 10)].format = getNumberFormat(this.getFormat(column.format), column.type, false, this.currencyCode);
+                if (!this.isExcel && (column.type === 'datetime' || column.type === 'date')) {
+                    columns[parseInt(i.toString(), 10)].format = columns[parseInt(i.toString(), 10)].format.toString().replace('AM/PM', 'tt');
+                }
+                columns[parseInt(i.toString(), 10)].type = column.type;
+            }
+            if (columns[parseInt(i.toString(), 10)].columns) {
+                this.setHeaderText(columns[parseInt(i.toString(), 10)].columns, include);
+            }
+            const keys = Object.keys(columns[parseInt(i.toString(), 10)]);
+            for (let j = 0; j < keys.length; j++) {
+                if (include.indexOf(keys[parseInt(j.toString(), 10)]) < 0) {
+                    delete columns[parseInt(i.toString(), 10)][keys[parseInt(j.toString(), 10)]];
+                }
+            }
+        }
+        return columns;
+    }
+    /**
+     * Retrieves the appropriate format string from the given format options.
+     *
+     * @param {string | NumberFormatOptions | DateFormatOptions} format - The format options to retrieve the format string from.
+     * @returns {string} The format string extracted from the provided format options.
+     */
+    getFormat(format) {
+        return typeof (format) === 'object' ? !isNullOrUndefined(format.format) ?
+            format.format : format.skeleton : format;
+    }
     /**
      * For internal use only - Get the module name.
      *
@@ -3711,7 +3833,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     requiredModules() {
         const modules = [];
         const splitFrozenCount = 'splitFrozenCount';
-        this.grid[`${splitFrozenCount}`](this.getGridColumns(this.columns));
+        this.grid[`${splitFrozenCount}`](this.getColumns());
         if (this.isDestroyed) {
             return modules;
         }
@@ -4068,9 +4190,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     IsExpandCollapseClicked(args) {
         if (!isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
             || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell'))
-            && (!isNullOrUndefined(args.data) && args.data['hasChildRecords']) && !this.selectionSettings.checkboxOnly) {
-            args.cancel = true;
-            return;
+            && !this.selectionSettings.checkboxOnly) {
+            if ((!isNullOrUndefined(args.data) && args.data['hasChildRecords']) || (args.rowIndex !== -1 && isNullOrUndefined(args.data))) {
+                args.cancel = true;
+                return;
+            }
         }
     }
     bindGridEvents() {
@@ -4186,9 +4310,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.updateAltRow(this.getRows());
             this.notify('dataBoundArg', args);
             if (isRemoteData(this) && !isOffline(this) && !this.hasChildMapping) {
-                const req = getObject('dataSource.requests', this).filter((e) => {
-                    return e.httpRequest.statusText !== 'OK';
-                }).length;
+                let req;
+                if (this.dataResults.result) {
+                    req = 0;
+                }
+                else {
+                    req = 1;
+                }
                 setValue('grid.contentModule.isLoaded', !(req > 0), this);
             }
             if (this.isPixelHeight() && this.initialRender) {
@@ -5935,7 +6063,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         const children = 'Children';
         if (!(isRemoteData(this) && !isOffline(this)) && (!isCountRequired(this) || !isNullOrUndefined(record[`${children}`]))) {
             let expandArgs = { data: record, row: row };
-            this.setHeightForFrozenContent();
             if (!isNullOrUndefined(this.expandStateMapping)) {
                 this.updateExpandStateMapping(expandArgs.data, true);
             }
@@ -5962,12 +6089,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.expandCollapse(action, null, records[parseInt(i.toString(), 10)]);
         }
     }
-    setHeightForFrozenContent() {
-        const freeze = (this.grid.getFrozenLeftColumnsCount() > 0 || this.grid.getFrozenRightColumnsCount() > 0) ? true : false;
-        if (this.grid.getFrozenColumns() > 0 || freeze) {
-            this.grid.contentModule.refreshScrollOffset();
-        }
-    }
     getCollapseExpandRecords(row, record) {
         if (this.allowPaging && this.pageSettings.pageSizeMode === 'All' && this.isExpandAll && isNullOrUndefined(record) &&
             !isRemoteData(this)) {
@@ -6043,7 +6164,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.expandCollapse('collapse', row, record);
         let collapseArgs = { data: record, row: row };
         if (!isRemoteData(this)) {
-            this.setHeightForFrozenContent();
             if (!isNullOrUndefined(this.expandStateMapping)) {
                 this.updateExpandStateMapping(collapseArgs.data, false);
             }
@@ -6488,7 +6608,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.isExpandRefresh = true;
             const scrollHeightBeforeRefresh = this.getContentTable().parentElement.scrollTop;
             this.grid.refresh();
-            this.setHeightForFrozenContent();
             if (this.enableInfiniteScrolling) {
                 this.getContentTable().parentElement.scrollTop = scrollHeightBeforeRefresh;
             }
@@ -6509,7 +6628,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.notify(remoteExpand, { record: record, rows: rows, parentRow: row });
             const args = { row: row, data: record };
             if (rows.length > 0) {
-                this.setHeightForFrozenContent();
                 this.trigger(expanded, args);
             }
         }
@@ -6518,7 +6636,6 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         else {
             this.collapseRemoteChild({ record: record, rows: rows });
-            this.setHeightForFrozenContent();
             this.trigger(collapsed, args);
         }
     }
@@ -6551,10 +6668,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         const freeze = (this.grid.getFrozenLeftColumnsCount() > 0 || this.grid.getFrozenRightColumnsCount() > 0) ? true : false;
         if (this.frozenRows || this.frozenColumns || this.getFrozenColumns() || freeze) {
-            movableRows = this.getMovableRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
+            movableRows = this.getRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
         }
         if (freeze) {
-            freezeRightRows = this.getFrozenRightRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
+            freezeRightRows = this.getRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
         }
         const gridRowsObject = this.grid.getRowsObject();
         const currentViewData = this.grid.currentViewData;
@@ -6650,8 +6767,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         let rightrows = [];
         const freeze = (this.getFrozenLeftColumnsCount() > 0 || this.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
-            movablerows = this.getMovableRows().filter((r) => r.querySelector('.e-gridrowindex' + rowDetails.record.index + 'level' + (rowDetails.record.level + 1)));
-            rightrows = this.getFrozenRightRows().filter((r) => r.querySelector('.e-gridrowindex' + rowDetails.record.index + 'level' + (rowDetails.record.level + 1)));
+            movablerows = this.getRows().filter((r) => r.querySelector('.e-gridrowindex' + rowDetails.record.index + 'level' + (rowDetails.record.level + 1)));
+            rightrows = this.getRows().filter((r) => r.querySelector('.e-gridrowindex' + rowDetails.record.index + 'level' + (rowDetails.record.level + 1)));
         }
         for (let i = 0; i < rows.length; i++) {
             rows[parseInt(i.toString(), 10)].style.display = 'none';
@@ -6859,59 +6976,72 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @param  {number} rowIndex - Specifies the row index.
      * @param  {number} columnIndex - Specifies the column index.
      * @returns {Element} - Returns movable cell element from the indexes passed
+     *
+     * @deprecated This method is deprecated. Use getCellFromIndex method instead.
      */
     getMovableCellFromIndex(rowIndex, columnIndex) {
-        return this.grid.getMovableCellFromIndex(rowIndex, columnIndex);
+        return this.grid.getCellFromIndex(rowIndex, columnIndex);
     }
     /**
      * Gets all the TreeGrid's movable table data rows.
      *
      * @returns {Element[]} - Returns element collection of movable rows
+     *
+     * @deprecated This method is deprecated. Use getDataRows method instead.
      */
     getMovableDataRows() {
-        return this.grid.getMovableDataRows();
+        return this.grid.getDataRows();
     }
     /**
      * Gets a movable tables row by index.
      *
      * @param  {number} index - Specifies the row index.
      * @returns {Element} - Returns movable row based on index passed
+     *
+     * @deprecated This method is deprecated. Use getRowByIndex method instead.
      */
     getMovableRowByIndex(index) {
-        return this.grid.getMovableRowByIndex(index);
+        return this.grid.getRowByIndex(index);
     }
     /**
      * Gets the TreeGrid's movable content rows from frozen treegrid.
      *
      * @returns {Element[]}: Returns movable row element
+     * @deprecated This method is deprecated. Use getRows method instead.
      */
     getMovableRows() {
-        return this.grid.getMovableRows();
+        return this.grid.getRows();
     }
     /**
      * Gets a frozen right tables row element by index.
      *
      * @param  {number} index - Specifies the row index.
      * @returns {Element} returns the element
+     *
+     * @deprecated This method is deprecated. Use getRowByIndex method instead.
      */
     getFrozenRightRowByIndex(index) {
-        return this.grid.getFrozenRightRowByIndex(index);
+        return this.grid.getRowByIndex(index);
     }
     /**
      * Gets the Tree Grid's frozen right content rows from frozen Tree Grid.
      *
      * @returns {Element[]} returns the element
+     *
+     * @deprecated This method is deprecated. Use getRows method instead.
      */
     getFrozenRightRows() {
-        return this.grid.getFrozenRightRows();
+        return this.grid.getRows();
     }
     /**
      * Gets all the Tree Grid's frozen right table data rows.
      *
      * @returns {Element[]} Returns the Element
+     *
+     * @deprecated This method is deprecated. Use getDataRows method instead.
      */
     getFrozenRightDataRows() {
-        return this.grid.getFrozenRightDataRows();
+        return this.grid.getDataRows();
     }
     /**
      * Gets a frozen right table cell by row and column index.
@@ -6919,36 +7049,44 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      * @param  {number} rowIndex - Specifies the row index.
      * @param  {number} columnIndex - Specifies the column index.
      * @returns {Element} Returns the Element
+     *
+     * @deprecated This method is deprecated. Use getCellFromIndex method instead.
      */
     getFrozenRightCellFromIndex(rowIndex, columnIndex) {
-        return this.grid.getFrozenRightCellFromIndex(rowIndex, columnIndex);
+        return this.grid.getCellFromIndex(rowIndex, columnIndex);
     }
     /**
      * Gets a frozen left column header by column index.
      *
      * @param  {number} index - Specifies the column index.
      * @returns {Element} Returns the Element
+     *
+     * @deprecated This method is deprecated. Use getColumnHeaderByIndex method instead.
      */
     getFrozenLeftColumnHeaderByIndex(index) {
-        return this.grid.getFrozenLeftColumnHeaderByIndex(index);
+        return this.grid.getColumnHeaderByIndex(index);
     }
     /**
      * Gets a frozen right column header by column index.
      *
      * @param  {number} index - Specifies the column index.
      * @returns {Element} Returns the Element
+     *
+     * @deprecated This method is deprecated. Use getColumnHeaderByIndex method instead.
      */
     getFrozenRightColumnHeaderByIndex(index) {
-        return this.grid.getFrozenRightColumnHeaderByIndex(index);
+        return this.grid.getColumnHeaderByIndex(index);
     }
     /**
      * Gets a movable column header by column index.
      *
      * @param  {number} index - Specifies the column index.
      * @returns {Element} Returns the Element
+     *
+     * @deprecated This method is deprecated. Use getColumnHeaderByIndex method instead.
      */
     getMovableColumnHeaderByIndex(index) {
-        return this.grid.getMovableColumnHeaderByIndex(index);
+        return this.grid.getColumnHeaderByIndex(index);
     }
     /**
      * @hidden
@@ -7182,6 +7320,9 @@ __decorate([
 __decorate([
     Complex({}, RowDropSettings)
 ], TreeGrid.prototype, "rowDropSettings", void 0);
+__decorate([
+    Property('USD')
+], TreeGrid.prototype, "currencyCode", void 0);
 __decorate([
     Property()
 ], TreeGrid.prototype, "pagerTemplate", void 0);
@@ -9077,8 +9218,8 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
             const currentPage = this[`${model}`].currentPage;
             if (clear) {
                 this.cache = {};
-                this.movableCache = {};
-                this.frozenRightCache = {};
+                /*this.movableCache = {};
+                this.frozenRightCache = {};*/
                 this.data = {};
                 this.groups = {};
             }
@@ -9093,8 +9234,8 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
                 this.cache = {};
                 this.data = {};
                 this.groups = {};
-                this.movableCache = {};
-                this.frozenRightCache = {};
+                /*this.movableCache = {};
+                this.frozenRightCache = {};*/
             }
         }
         return clear;
@@ -10669,22 +10810,8 @@ class BatchEdit {
         this.batchAddedRecords = this.batchRecords = this.batchAddRowRecord = this.batchDeletedRecords = this.currentViewRecords = [];
     }
     cellSaved(args) {
-        let actualCellIndex = args.column.index;
-        const frozenCols = this.parent.frozenColumns || this.parent.getFrozenColumns();
-        if (frozenCols && args.columnObject.index > frozenCols) {
-            actualCellIndex = actualCellIndex + frozenCols;
-        }
-        const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
-            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
-        if (freeze) {
-            const colCount = this.parent.getFrozenLeftColumnsCount() + actualCellIndex;
-            if (colCount === this.parent.treeColumnIndex) {
-                this.parent.renderModule.cellRender({ data: args.rowData, cell: args.cell,
-                    column: this.parent.grid.getColumnByIndex(args.column.index)
-                });
-            }
-        }
-        else if (actualCellIndex === this.parent.treeColumnIndex) {
+        const actualCellIndex = args.column.index;
+        if (actualCellIndex === this.parent.treeColumnIndex) {
             this.parent.renderModule.cellRender({ data: args.rowData, cell: args.cell,
                 column: this.parent.grid.getColumnByIndex(args.column.index)
             });
@@ -10888,7 +11015,7 @@ class BatchEdit {
             for (let i = firstChildIndex; i <= totalCount; i++) {
                 row.push(this.parent.grid.getDataRows()[parseInt(i.toString(), 10)]);
                 if (this.parent.frozenRows || this.parent.frozenColumns || this.parent.getFrozenColumns()) {
-                    row.push(this.parent.grid.getMovableRows()[parseInt(i.toString(), 10)]);
+                    row.push(this.parent.grid.getHeaderContent()[parseInt(i.toString(), 10)]);
                 }
             }
         }
@@ -10920,18 +11047,6 @@ class BatchEdit {
         for (let i = 0; i < rows.length; i++) {
             rows[parseInt(i.toString(), 10)].setAttribute('data-rowindex', i.toString());
         }
-        const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
-            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
-        if (this.parent.frozenRows || this.parent.getFrozenColumns() || this.parent.frozenColumns || freeze) {
-            const mRows = this.parent.grid.getMovableDataRows();
-            const freezeRightRows = this.parent.grid.getFrozenRightDataRows();
-            for (let i = 0; i < mRows.length; i++) {
-                mRows[parseInt(i.toString(), 10)].setAttribute('data-rowindex', i.toString());
-                if (freeze) {
-                    freezeRightRows[parseInt(i.toString(), 10)].setAttribute('data-rowindex', i.toString());
-                }
-            }
-        }
     }
     updateChildCount(records) {
         const primaryKey = this.parent.grid.getPrimaryKeyFieldNames()[0];
@@ -11389,8 +11504,8 @@ class Edit$1 {
                 currentData.splice(newRowObjectIndex, 0, newRecord);
                 this.updateInfiniteCurrentViewData(newRecord, this.addRowIndex);
             }
-            const movableRows = this.parent.grid.getMovableRows();
-            const movableRowsObject = this.parent.grid.getMovableRowsObject();
+            const movableRows = this.parent.grid.getRows();
+            const movableRowsObject = this.parent.grid.getRowsObject();
             const isCache = this.parent.infiniteScrollSettings.enableCache;
             if (!isCache) {
                 resetRowIndex(this.parent.grid, this.parent.grid.getRowsObject(), this.parent.grid.getRows(), 0);
@@ -11594,16 +11709,13 @@ class Edit$1 {
                     if (this.parent.getRows().indexOf(row) !== -1) {
                         rowIndex = this.parent.getRows().indexOf(row);
                     }
-                    else if (this.parent.getFrozenRightRows().indexOf(row) !== -1) {
-                        rowIndex = this.parent.getFrozenRightRows().indexOf(row);
-                    }
                     else {
-                        rowIndex = this.parent.getMovableRows().indexOf(row);
+                        rowIndex = this.parent.getRows().indexOf(row);
                     }
                 }
                 else {
                     rowIndex = (this.parent.getRows().indexOf(row) === -1 && (this.parent.getFrozenColumns() > 0)) ?
-                        this.parent.grid.getMovableRows().indexOf(row) : this.parent.getRows().indexOf(row);
+                        this.parent.grid.getRows().indexOf(row) : this.parent.getRows().indexOf(row);
                 }
             }
             const arg = {};
@@ -11659,7 +11771,6 @@ class Edit$1 {
         }
     }
     afterCellSave(args, row, rowIndex) {
-        let mRow;
         if (this.parent.grid.aggregateModule) {
             this.parent.grid.aggregateModule.refresh(args.rowData);
         }
@@ -11670,31 +11781,6 @@ class Edit$1 {
             this.isOnBatch = false;
         }
         this.enableToolbarItems('save');
-        const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
-            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
-        if (freeze) {
-            if (args.cell.closest('.e-frozen-left-header') || args.cell.closest('.e-frozen-left-content')) {
-                mRow = this.parent.grid.getRows()[parseInt(rowIndex.toString(), 10)];
-            }
-            else if (args.cell.closest('.e-movableheader') || args.cell.closest('.e-movablecontent')) {
-                mRow = this.parent.grid.getMovableRows()[parseInt(rowIndex.toString(), 10)];
-            }
-            else {
-                mRow = this.parent.grid.getFrozenRightRows()[parseInt(rowIndex.toString(), 10)];
-            }
-            removeClass([mRow], ['e-editedrow', 'e-batchrow']);
-            removeClass(mRow.querySelectorAll('.e-rowcell'), ['e-editedbatchcell', 'e-updatedtd']);
-        }
-        else if (this.parent.getFrozenColumns() > 0) {
-            if (args.cell.closest('.e-frozenheader') || args.cell.closest('.e-frozencontent')) {
-                mRow = this.parent.grid.getRows()[parseInt(rowIndex.toString(), 10)];
-            }
-            else {
-                mRow = this.parent.grid.getMovableRows()[parseInt(rowIndex.toString(), 10)];
-            }
-            removeClass([mRow], ['e-editedrow', 'e-batchrow']);
-            removeClass(mRow.querySelectorAll('.e-rowcell'), ['e-editedbatchcell', 'e-updatedtd']);
-        }
         removeClass([row], ['e-editedrow', 'e-batchrow']);
         removeClass(row.querySelectorAll('.e-rowcell'), ['e-editedbatchcell', 'e-updatedtd']);
         if (this.parent['isCellSaveFocus'] !== false) {
@@ -11880,23 +11966,6 @@ class Edit$1 {
                     this.parent.grid.contentModule[`${r}`].splice(0, 1);
                     this.parent.grid.contentModule[`${r}`].splice(rowObjectIndex, 0, newRowObject);
                 }
-                const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
-                    this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
-                if (this.parent.frozenRows || this.parent.getFrozenColumns() || this.parent.frozenColumns || freeze) {
-                    const movableRows = this.parent.getMovableDataRows();
-                    const frows = 'freezeRows';
-                    const newFreezeRowObject = this.parent.grid.getRowsObject()[0];
-                    movableRows[index + 1][`${position}`](movableRows[0]);
-                    if (freeze) {
-                        const rightFrozenRows = this.parent.getFrozenRightDataRows();
-                        rightFrozenRows[index + 1][`${position}`](rightFrozenRows[0]);
-                    }
-                    if (this.parent.editSettings.mode === 'Batch') {
-                        this.parent.grid.contentModule[`${frows}`].splice(0, 1);
-                        this.parent.grid.contentModule[`${frows}`].splice(rowObjectIndex, 0, newFreezeRowObject);
-                    }
-                    setValue('batchIndex', index + 1, this.batchEditModule);
-                }
                 if (this.parent.editSettings.mode === 'Row' || this.parent.editSettings.mode === 'Cell') {
                     const errors = this.parent.grid.getContentTable().querySelectorAll('.e-griderror');
                     for (let i = 0; i < errors.length; i++) {
@@ -12265,8 +12334,8 @@ class Edit$1 {
                 || (this.parent.editSettings.mode === 'Batch' && e.args.requestType.toString() === 'batchsave'))) {
             this.updateIndex(this.parent.grid.dataSource, this.parent.getRows(), this.parent.getCurrentViewRecords());
             if (this.parent.frozenRows || this.parent.getFrozenColumns() || this.parent.frozenColumns) {
-                if (this.parent.grid.dataSource.length === this.parent.getMovableDataRows().length) {
-                    this.updateIndex(this.parent.grid.dataSource, this.parent.getMovableDataRows(), this.parent.getCurrentViewRecords());
+                if (this.parent.grid.dataSource.length === this.parent.getDataRows().length) {
+                    this.updateIndex(this.parent.grid.dataSource, this.parent.getDataRows(), this.parent.getCurrentViewRecords());
                 }
             }
         }
@@ -12453,18 +12522,19 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         return new TreeVirtualRowModelGenerator(this.parent);
     }
     getRowByIndex(index) {
-        return this.parent.getDataRows().filter((e) => parseInt(e.getAttribute('data-rowindex'), 10) === index)[0];
-    }
-    getMovableVirtualRowByIndex(index) {
-        return this.getRowCollection(index, true);
+        if (this.parent.enableVirtualization && this.parent.isFrozenGrid()) {
+            return this.getRowCollection(index, true);
+        }
+        else {
+            return this.parent.getDataRows().filter((e) => parseInt(e.getAttribute('data-rowindex'), 10) === index)[0];
+        }
     }
     getFrozenRightVirtualRowByIndex(index) {
         return this.getRowCollection(index, false, false, true);
     }
     getRowCollection(index, isMovable, isRowObject, isFrozenRight) {
         const startIdx = parseInt(this.parent.getRows()[0].getAttribute(dataRowIndex), 10);
-        let rowCollection = isMovable ? this.parent.getMovableDataRows() : this.parent.getDataRows();
-        rowCollection = isFrozenRight ? this.parent.getFrozenRightDataRows() : rowCollection;
+        const rowCollection = this.parent.getDataRows();
         const collection = isRowObject ? this.parent.getCurrentViewRecords() : rowCollection;
         let selectedRow = collection[index - startIdx];
         if (this.parent.frozenRows && this.parent.pageSettings.currentPage > 1) {
@@ -12517,8 +12587,8 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.endIndex = this.parent.pageSettings.pageSize - 1;
         }
         if ((this.endIndex - this.startIndex !== this.parent.pageSettings.pageSize) &&
-            (this.totalRecords > this.parent.pageSettings.pageSize) &&
-            (this.endIndex === this.totalRecords)) {
+            (this.totalRecords > this.parent.pageSettings.pageSize)
+            && (this.endIndex === this.totalRecords)) {
             args.startIndex = this.endIndex - this.parent.pageSettings.pageSize;
             args.endIndex = this.endIndex;
         }
@@ -12914,29 +12984,16 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         }
     }
     appendContent(target, newChild, e) {
-        const isFrozen = this.parent.isFrozenGrid();
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
             && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent) || this.parent.isFrozenGrid()) {
             if (getValue('isExpandCollapse', e)) {
                 this.isRemoteExpand = true;
             }
-            if (isFrozen && ((isNullOrUndefined(this.requestType) && getValue('requestTypes', this).indexOf('isFrozen') === -1) ||
-                (this.parent.enableVirtualMaskRow && this.requestType === 'virtualscroll'))) {
-                getValue('requestTypes', this).push('isFrozen');
-                this.requestType = 'isFrozen';
-            }
             super.appendContent(target, newChild, e);
             if (getValue('requestTypes', this).indexOf('isFrozen') !== -1) {
                 getValue('requestTypes', this).splice(getValue('requestTypes', this).indexOf('isFrozen'), 1);
                 this.requestType = this.requestType === 'isFrozen' ? undefined : this.requestType;
             }
-            if (isFrozen && (!this.isExpandCollapse || this.translateY === 0)) {
-                this.translateY = this.translateY < 0 ? 0 : this.translateY;
-                getValue('virtualEle', this).adjustTable(0, this.translateY);
-            }
-            else {
-                this.isExpandCollapse = false;
-            }
         }
         else {
             const info = e.virtualInfo.sentinelInfo && e.virtualInfo.sentinelInfo.axis === 'Y' &&
@@ -13187,6 +13244,7 @@ class VirtualScroll$1 {
         this.parent.grid.notify(indexModifier, counts);
         let startIndex = counts.startIndex;
         let endIndex = counts.endIndex;
+        pageingDetails.count = visualData.length;
         if (startIndex === -1 && endIndex === -1) {
             let query = new Query();
             const size = this.parent.grid.pageSettings.pageSize;
@@ -13205,7 +13263,7 @@ class VirtualScroll$1 {
                 this.parent.grid.getContent().firstElementChild.scrollTop = 0;
                 this.parent.grid.notify(virtualActionArgs, { setTop: true });
             }
-            if ((requestType === 'save' && (pageingDetails.actionArgs.index >= (counts.count - this.parent.grid.pageSettings.pageSize)) || (requestType === 'refresh' && this.parent['isGantt'] && this.parent['isAddedFromGantt']) && (counts.count === this.prevendIndex + 1))) {
+            if ((requestType === 'save' && pageingDetails.actionArgs.index >= (counts.count - this.parent.grid.pageSettings.pageSize)) || (requestType === 'refresh' && this.parent['isGantt'] && this.parent['isAddedFromGantt'])) {
                 startIndex = counts.startIndex + (counts.count - counts.endIndex);
                 endIndex = counts.count;
                 this.parent['isAddedFromGantt'] = false;
@@ -13275,15 +13333,12 @@ class TreeVirtual extends VirtualScroll {
         const parentGrid = getValue('parent', this);
         getValue('parent', this).log(['limitation', 'virtual_height'], 'virtualization');
         const renderer = getValue('locator', this).getService('rendererFactory');
-        if (!parentGrid.isFrozenGrid()) {
-            if (parentGrid.enableColumnVirtualization) {
-                getValue('addRenderer', renderer)
-                    .apply(renderer, [RenderType.Header, new VirtualHeaderRenderer(getValue('parent', this), getValue('locator', this))]);
-            }
+        if (parentGrid.enableColumnVirtualization) {
             getValue('addRenderer', renderer)
-                .apply(renderer, [RenderType.Content, new VirtualTreeContentRenderer(getValue('parent', this), getValue('locator', this))]);
+                .apply(renderer, [RenderType.Header, new VirtualHeaderRenderer(getValue('parent', this), getValue('locator', this))]);
         }
-        //renderer.addRenderer(RenderType.Content, new VirtualTreeContentRenderer(getValue('parent', this), getValue('locator', this)));
+        getValue('addRenderer', renderer)
+            .apply(renderer, [RenderType.Content, new VirtualTreeContentRenderer(getValue('parent', this), getValue('locator', this))]);
         this.ensurePageSize();
     }
     ensurePageSize() {
@@ -13301,138 +13356,6 @@ class TreeVirtual extends VirtualScroll {
     }
 }
 
-/**
- * VirtualTreeFreezeRenderer is used to render the virtual table within the frozen and movable content table
- *
- * @hidden
- */
-class VirtualTreeFreezeRenderer extends VirtualFreezeRenderer {
-    constructor(parent, locator) {
-        super(parent, locator);
-        this.addEventListener();
-    }
-    /**
-     * @returns {void}
-     * @hidden
-     */
-    renderTable() {
-        this.freezeRowGenerator = new FreezeRowModelGenerator(this.parent);
-        this.virtualRenderer = new VirtualTreeContentRenderer(this.parent, this.serviceLoc);
-        this.virtualRenderer.header = this.serviceLoc.getService('rendererFactory')
-            .getRenderer(RenderType.Header).virtualHdrRenderer;
-        FreezeContentRender.prototype.renderTable.call(this);
-        this.virtualRenderer.setPanel(this.parent.getContent());
-        this.scrollbar = this.parent.getContent().querySelector('.e-movablescrollbar');
-        const movableCont = this.getMovableContent();
-        const minHeight = this.parent.height;
-        this.virtualRenderer.virtualEle.content = this.virtualRenderer.content = this.getPanel().querySelector('.' + content);
-        this.virtualRenderer.virtualEle.content.style.overflowX = 'hidden';
-        this.virtualRenderer.virtualEle.renderFrozenWrapper(minHeight);
-        this.virtualRenderer.virtualEle.renderFrozenPlaceHolder();
-        if (this.parent.enableColumnVirtualization) {
-            this.virtualRenderer.virtualEle.movableContent = this.virtualRenderer.movableContent
-                = this.getPanel().querySelector('.' + movableContent);
-            this.virtualRenderer.virtualEle.renderMovableWrapper(minHeight);
-            this.virtualRenderer.virtualEle.renderMovablePlaceHolder();
-            const tbl = movableCont.querySelector('table');
-            this.virtualRenderer.virtualEle.movableTable = tbl;
-            this.virtualRenderer.virtualEle.movableWrapper.appendChild(tbl);
-            movableCont.appendChild(this.virtualRenderer.virtualEle.movableWrapper);
-            movableCont.appendChild(this.virtualRenderer.virtualEle.movablePlaceholder);
-        }
-        this.virtualRenderer.virtualEle.wrapper.appendChild(this.getFrozenContent());
-        this.virtualRenderer.virtualEle.wrapper.appendChild(movableCont);
-        this.virtualRenderer.virtualEle.table = this.getTable();
-        setDebounce(this.parent, this.virtualRenderer, this.scrollbar, this.getMovableContent());
-    }
-    /**
-     * @param {HTMLElement} target - specifies the target
-     * @param {DocumentFragment} newChild - specifies the newChild
-     * @param {NotifyArgs} e - specifies the notifyargs
-     * @returns {void}
-     * @hidden
-     */
-    appendContent(target, newChild, e) {
-        getValue('observer', this.virtualRenderer).options.debounceEvent = false;
-        this.virtualRenderer['observers'] = new TreeInterSectionObserver(getValue('observer', this.virtualRenderer).element, getValue('observer', this.virtualRenderer).options, getValue('observer', this.virtualRenderer).movableEle);
-        this.virtualRenderer['contents'] = this.getPanel().firstChild;
-        super.appendContent(target, newChild, e);
-    }
-    /**
-     * @param {Object[]} data - specifies the data
-     * @param {NotifyArgs} e - specifies the notifyargs
-     * @returns {Row<Column>[]} returns the row
-     * @hidden
-     */
-    generateRows(data, e) {
-        return super.generateRows(data, e);
-    }
-}
-/**
- * ColumnVirtualTreeFreezeRenderer is used to render the virtual table within the frozen and movable content table
- *
- * @hidden
- */
-class ColumnVirtualTreeFreezeRenderer extends ColumnVirtualFreezeRenderer {
-    constructor(parent, locator) {
-        super(parent, locator);
-        this.serviceLoc = locator;
-        this.eventListener('on');
-    }
-    /**
-     * @returns {void}
-     * @hidden
-     */
-    renderTable() {
-        this.virtualRenderer = new VirtualTreeContentRenderer(this.parent, this.serviceLoc);
-        this.virtualRenderer.header = this.serviceLoc.getService('rendererFactory')
-            .getRenderer(RenderType.Header).virtualHdrRenderer;
-        this.freezeRowGenerator = new FreezeRowModelGenerator(this.parent);
-        ColumnFreezeContentRenderer.prototype.renderTable.call(this);
-        this.virtualRenderer.setPanel(this.parent.getContent());
-        this.scrollbar = this.parent.getContent().querySelector('.e-movablescrollbar');
-        const frozenRightCont = this.getFrozenRightContent();
-        let frzCont = this.getFrozenContent();
-        const movableCont = this.getMovableContent();
-        if (this.parent.getFrozenMode() === 'Right') {
-            frzCont = frozenRightCont;
-        }
-        this.virtualRenderer.virtualEle.content = this.virtualRenderer.content = this.getPanel().querySelector('.' + content);
-        this.virtualRenderer.virtualEle.content.style.overflowX = 'hidden';
-        const minHeight = this.parent.height;
-        this.virtualRenderer.virtualEle.renderFrozenWrapper(minHeight);
-        this.virtualRenderer.virtualEle.renderFrozenPlaceHolder();
-        super['renderVirtualFrozenLeft'](frzCont, movableCont);
-        super['renderVirtualFrozenRight'](frzCont, movableCont);
-        super['renderVirtualFrozenLeftRight'](frzCont, movableCont, frozenRightCont);
-        this.virtualRenderer.virtualEle.table = this.getTable();
-        setDebounce(this.parent, this.virtualRenderer, this.scrollbar, this.getMovableContent());
-    }
-    appendContent(target, newChild, e) {
-        getValue('observer', this.virtualRenderer).options.debounceEvent = false;
-        this.virtualRenderer['observers'] = new TreeInterSectionObserver(getValue('observer', this.virtualRenderer).element, getValue('observer', this.virtualRenderer).options, getValue('observer', this.virtualRenderer).movableEle);
-        this.virtualRenderer['contents'] = this.getPanel().firstChild;
-        super.appendContent(target, newChild, e);
-    }
-}
-/**
- * VirtualTreeFreezeHdrRenderer is used to render the virtual table within the frozen and movable header table
- *
- * @hidden
- */
-class VirtualTreeFreezeHdrRenderer extends VirtualFreezeHdrRenderer {
-    /**
-     * @returns {void}
-     * @hidden
-     */
-    renderTable() {
-        super.renderTable();
-    }
-    rfshMovable() {
-        super.rfshMovable();
-    }
-}
-
 /**
  * TreeGrid Freeze module
  *
@@ -13453,7 +13376,6 @@ class Freeze$1 {
         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);
     }
     removeEventListener() {
         if (this.parent.isDestroyed) {
@@ -13462,46 +13384,16 @@ class Freeze$1 {
         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);
-    }
-    instantiateRenderer() {
-        const 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))]);
-            }
-        }
-        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))]);
-            }
-        }
     }
     rowExpandCollapse(args) {
-        const movableRows = this.parent.getMovableDataRows();
+        const movableRows = this.parent.getDataRows();
         const frozenrows = this.parent.getRows();
         let rows;
         let frozenRightRows;
         const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
             this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
-            frozenRightRows = this.parent.getFrozenRightRows().filter((e) => e.querySelector('.e-gridrowindex' + args.record.index + 'level' + (args.record.level + 1)));
+            frozenRightRows = this.parent.getRows().filter((e) => e.querySelector('.e-gridrowindex' + args.record.index + 'level' + (args.record.level + 1)));
         }
         if (!args.detailrows.length) {
             rows = movableRows.filter((e) => e.querySelector('.e-gridrowindex' + args.record.index + 'level' + (args.record.level + 1)));
@@ -13706,7 +13598,7 @@ class InfiniteScroll$1 {
             const updateIndex = 'updateIndex';
             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.getDataRows(), this.parent.getCurrentViewRecords());
             }
         }
     }
@@ -13826,8 +13718,8 @@ class InfiniteScroll$1 {
             const keyField = this.parent.grid.getPrimaryKeyFieldNames()[0];
             this.removeRows(rowElms, rows, data, keyField, true);
             if (this.parent.getFrozenColumns() > 0) {
-                const mRows = this.parent.grid.getMovableRowsObject();
-                const mRowElms = this.parent.grid.getMovableRows();
+                const mRows = this.parent.grid.getRowsObject();
+                const mRowElms = this.parent.grid.getRows();
                 this.removeRows(mRowElms, mRows, data, keyField);
             }
         }
@@ -13869,23 +13761,23 @@ class InfiniteScroll$1 {
         const rowRenderer = new RowRenderer(serviceLocator, null, this.parent.grid);
         let tbody;
         const currentData = this.parent.getCurrentViewRecords();
-        const currentRows = eventArgs.isMovable ? this.parent.grid.getMovableRows()
+        const currentRows = eventArgs.isMovable ? this.parent.grid.getRows()
             : this.parent.grid.getDataRows();
         if (eventArgs.isFrozenRight) {
             tbody = this.parent.element.querySelector('.e-frozen-right-content').querySelector('tbody');
         }
         else {
             tbody = !this.parent.grid.isFrozenGrid() ? this.parent.getContent().querySelector('tbody') : eventArgs.isMovable
-                ? this.parent.grid.getMovableVirtualContent().querySelector('tbody')
-                : this.parent.grid.getFrozenVirtualContent().querySelector('tbody');
+                ? this.parent.grid.getContent().querySelector('tbody')
+                : this.parent.grid.getContent().querySelector('tbody');
         }
         if (this.parent.frozenRows) {
             tbody = eventArgs.isFrozenRows && this.parent.grid.infiniteScrollModule.requestType !== 'add'
                 || !eventArgs.isFrozenRows && this.parent.grid.infiniteScrollModule.requestType === 'add'
                 ? !this.parent.grid.isFrozenGrid() ? this.parent.getHeaderContent().querySelector('tbody')
-                    : eventArgs.isMovable ? this.parent.grid.getMovableVirtualHeader().querySelector('tbody')
+                    : eventArgs.isMovable ? this.parent.grid.getHeaderContent().querySelector('tbody')
                         : eventArgs.isFrozenRight ? this.parent.element.querySelector('.e-frozen-right-header').querySelector('tbody')
-                            : this.parent.grid.getFrozenVirtualHeader().querySelector('tbody') : tbody;
+                            : this.parent.grid.getHeaderContent().querySelector('tbody') : tbody;
         }
         let position;
         const addRowIndex = 'addRowIndex';