@syncfusion/ej2-treegrid 33.2.12 → 34.1.29

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

@@ -2467,12 +2467,10 @@ class DataManipulation {
             if (this.parent.parentIdMapping) {
                 this.parent.query = isNullOrUndefined(this.parent.query) ?
                     new Query() : this.parent.query;
-                if (this.parent.parentIdMapping) {
-                    const filterKey = this.parent.query.params.filter((param) => param.key === 'IdMapping');
-                    if (this.parent.initialRender && !filterKey.length) {
-                        this.parent.query.where(this.parent.parentIdMapping, 'equal', null);
-                        this.parent.query.addParams('IdMapping', this.parent.idMapping);
-                    }
+                const filterKey = this.parent.query.params.filter((param) => param.key === 'IdMapping');
+                if (this.parent.initialRender && !filterKey.length) {
+                    this.parent.query.where(this.parent.parentIdMapping, 'equal', null);
+                    this.parent.query.addParams('IdMapping', this.parent.idMapping);
                 }
                 if (!this.parent.hasChildMapping) {
                     let qry = this.parent.query.clone();
@@ -3027,9 +3025,6 @@ class DataManipulation {
                         ? currentData[this.parent.expandStateMapping] : true;
                 }
             }
-            if (!Object.prototype.hasOwnProperty.call(currentData, 'index')) {
-                currentData.index = currentData.hasChildRecords ? this.storedIndex : this.storedIndex;
-            }
             if (this.isSelfReference && isNullOrUndefined(currentData[this.parent.parentIdMapping])) {
                 this.parent.parentData.push(currentData);
             }
@@ -3216,8 +3211,7 @@ class DataManipulation {
         }
         const isPdfExport = 'isPdfExport';
         const isCollapsedStatePersist = 'isCollapsedStatePersist';
-        if ((isPrinting === true || (args[`${isPdfExport}`] && (isNullOrUndefined(args[`${isCollapsedStatePersist}`])
-            || args[`${isCollapsedStatePersist}`]))) && this.parent.printMode === 'AllPages') {
+        if ((isPrinting === true || (args[`${isPdfExport}`] && args[`${isCollapsedStatePersist}`] === true)) && this.parent.printMode === 'AllPages') {
             const actualResults = [];
             for (let i = 0; i < results.length; i++) {
                 const expandStatus = getExpandStatus(this.parent, results[parseInt(i.toString(), 10)], this.parent.parentData);
@@ -5418,8 +5412,13 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.grid.dataSource = { result: data, count: datacount };
         }
         else {
+            let cacheAdaptor = null;
+            if ((this.dataSource instanceof DataManager) && this.dataSource[`${dataSource}`] &&
+                this.dataSource[`${dataSource}`].enableCaching) {
+                cacheAdaptor = this.dataSource[`${adaptor}`].cacheAdaptor;
+            }
             this.grid.dataSource = !(this.dataSource instanceof DataManager) ?
-                this.flatData : new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor, this.hasPreAndPostMiddleware(this.dataSource) ? this.dataSource : undefined);
+                this.flatData : new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, cacheAdaptor ? cacheAdaptor : this.dataSource.adaptor, this.hasPreAndPostMiddleware(this.dataSource) ? this.dataSource : undefined);
         }
         if (this.dataSource instanceof DataManager && (this.dataSource.dataSource.offline || this.dataSource.ready)) {
             this.grid.dataSource[`${dataSource}`].json = extendArray(this.dataSource[`${dataSource}`].json);
@@ -5813,6 +5812,14 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     gridColumn.textAlign = 'Right';
                 }
             }
+            else if (!isNullOrUndefined(this.columnModel[this.treeColumnIndex]) && !this.enableRtl) {
+                if (isNullOrUndefined(this.treeColumnField)) {
+                    this.treeColumnField = gridColumn.field;
+                }
+                if (isNullOrUndefined(this.treeColumnTextAlign) && this.treeColumnField === this.columnModel[this.treeColumnIndex].field) {
+                    this.treeColumnTextAlign = this.columnModel[this.treeColumnIndex].textAlign;
+                }
+            }
         }
         return gridColumnCollection;
     }
@@ -5834,6 +5841,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     onPropertyChanged(newProp) {
         const properties = Object.keys(newProp);
         let requireRefresh = false;
+        let refreshComponent = false;
         for (const prop of properties) {
             switch (prop) {
                 case 'columns':
@@ -5976,6 +5984,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.TreeGridLocale();
                     this.grid.toolbar = this.getGridToolbar();
                     this.grid.contextMenuItems = this.getContextMenu();
+                    requireRefresh = true;
+                    refreshComponent = true;
                     break;
                 case 'selectedRowIndex':
                     this.grid.selectedRowIndex = this.selectedRowIndex;
@@ -6005,10 +6015,8 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.grid.allowPdfExport = this.allowPdfExport;
                     break;
                 case 'enableRtl':
-                    if (!isNullOrUndefined(this.treeColumnField)) {
-                        this.updateTreeColumnTextAlign();
-                    }
                     this.grid.enableRtl = this.enableRtl;
+                    this.updateColumnModel();
                     break;
                 case 'allowReordering':
                     this.grid.allowReordering = this.allowReordering;
@@ -6061,7 +6069,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
         }
         if (requireRefresh) {
-            if (this.isFrozenGrid()) {
+            if (refreshComponent || this.isFrozenGrid()) {
                 this.refreshLayout();
             }
             else {
@@ -6873,6 +6881,12 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (!this.stackedHeader && !isNullOrUndefined(this.columns)) {
             merge(this.columns, this.columnModel);
         }
+        if (!this.enableRtl && !isNullOrUndefined(this.columnModel[this.treeColumnIndex])
+            && !isNullOrUndefined(this.treeColumnField)) {
+            if (this.columnModel[this.treeColumnIndex].field === this.treeColumnField) {
+                this.columnModel[this.treeColumnIndex].textAlign = this.treeColumnTextAlign;
+            }
+        }
         this[`${deepMerge}`] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     }
@@ -8734,6 +8748,15 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             return 0;
         }
     }
+    /**
+     * Gets the row index based on the given primary key value or row data.
+     *
+     * @param {string | number | object} value - The primary key value or row data.
+     * @returns {number} Returns the row index.
+     */
+    getRowIndexByPrimaryKey(value) {
+        return this.grid.getRowIndexByPrimaryKey(value);
+    }
 };
 __decorate$c([
     Property(0)
@@ -11913,7 +11936,9 @@ class PdfExport {
         }
         prop = isNullOrUndefined(prop) ? {} : prop;
         prop.dataSource = new DataManager({ json: dtSrc });
-        prop.query = args['query'];
+        if (this.parent.aggregates.length > 0) {
+            prop.query = args['query'];
+        }
         return prop;
     }
     /**
@@ -13135,7 +13160,8 @@ class BatchEdit {
             if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) &&
                 !this.parent.editModule['isAddedRowByContextMenu'] && !this.parent.editModule.isAddedMultipleRowsByMethod) {
                 const newlyAddedRecords = this.parent.getBatchChanges()['addedRecords'];
-                const index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[newlyAddedRecords.length - 1].getAttribute('aria-rowindex'), 10) - 1;
+                const index = this.getInsertedRowIndex(newlyAddedRecords.length - 1);
+                this.batchIndex = index;
                 this.batchRecords.splice(index, 0, newlyAddedRecords[newlyAddedRecords.length - 1]);
             }
         }
@@ -13302,6 +13328,17 @@ class BatchEdit {
         this.batchDeletedRecords = [];
         this.parent.grid.renderModule.refresh();
     }
+    getInsertedRowIndex(elementIndex) {
+        const header = this.parent.getHeaderTable().getElementsByClassName('e-insertedrow')[parseInt(elementIndex.toString(), 10)];
+        const content = this.parent.getContentTable().getElementsByClassName('e-insertedrow')[parseInt(elementIndex.toString(), 10)];
+        if (this.parent.frozenRows && header) {
+            return parseInt(header.getAttribute('aria-rowindex'), 10) - 1;
+        }
+        if (content) {
+            return parseInt(content.getAttribute('aria-rowindex'), 10) - 1;
+        }
+        return -1;
+    }
     batchSave(args) {
         if (this.parent.editSettings.mode === 'Batch') {
             let i;
@@ -13330,7 +13367,7 @@ class BatchEdit {
                 if (this.parent.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
                     addRecords.reverse();
                     for (let i = 0; i < addRecords.length; i++) {
-                        const index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[parseInt(i.toString(), 10)].getAttribute('aria-rowindex'), 10) - 1;
+                        const index = this.getInsertedRowIndex(parseInt(i.toString(), 10));
                         data.splice(index, 0, addRecords[parseInt(i.toString(), 10)]);
                     }
                 }
@@ -13570,6 +13607,7 @@ class Edit {
         this.parent.grid.on(beforeBatchCancel, this.beforeBatchCancel, this);
         this.parent.grid.on('reset-edit-props', this.resetIsOnBatch, this);
         this.parent.grid.on('get-row-position', this.getRowPosition, this);
+        this.parent.grid.on('last-row-validation', this.lastRowValidation, this);
     }
     gridDblClick(e) {
         this.doubleClickTarget = e.target;
@@ -13583,6 +13621,7 @@ class Edit {
                 /* eslint-disable-next-line */
                 this.parent.grid.getDataRows()[rowIndex].dataset.uid = this.parent.grid.contentModule.getRows()[rowIndex].uid;
             }
+            this.doubleClickTarget = null;
         }
     }
     getRowPosition(addArgs) {
@@ -13628,6 +13667,7 @@ class Edit {
         this.parent.grid.off('dblclick', this.gridDblClick);
         this.parent.grid.off('reset-edit-props', this.resetIsOnBatch);
         this.parent.grid.off('get-row-position', this.getRowPosition);
+        this.parent.grid.off('last-row-validation', this.lastRowValidation);
         //this.parent.grid.off('click', this.gridSingleClick);
     }
     /**
@@ -13775,7 +13815,7 @@ class Edit {
         this.parent.grid.isEdit = false;
     }
     resetIsOnBatch() {
-        if (this.parent.enableVirtualization && this.parent.editSettings.mode === 'Cell') {
+        if (this.parent.enableVirtualization && this.parent.editSettings.mode === 'Cell' && !this.parent['isGantt']) {
             this.isOnBatch = false;
             this.updateGridEditMode('Normal');
         }
@@ -14206,7 +14246,9 @@ class Edit {
                 seletedRow: 0
             };
             this.beginAddEdit(args);
-            this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+            if (this.batchEditModule['addRowRecord']) {
+                this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+            }
             this.batchEditModule['batchAddedRecords'].push(args['data']);
         }
         else if (this.parent.editSettings.mode === 'Batch' && this.isAddedMultipleRowsByMethod && (this.parent.editSettings.newRowPosition === 'Above' || this.parent.editSettings.newRowPosition === 'Below')) {
@@ -14226,7 +14268,9 @@ class Edit {
                         seletedRow: 0
                     };
                     this.beginAddEdit(args);
-                    this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+                    if (this.batchEditModule['addRowRecord']) {
+                        this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+                    }
                     this.batchEditModule['batchAddedRecords'].push(args['data']);
                 }
             }
@@ -14633,6 +14677,31 @@ class Edit {
         }
         this.parent.grid.editModule.closeEdit();
     }
+    /**
+     * Handles TreeGrid-specific validation for tooltip positioning on last row.
+     *
+     * @param {Object} args - Validation flags
+     * @param {boolean} args.isBeginEdit - Whether editing has begun
+     * @param {boolean} args.isAddedRow - Whether the row is newly added
+     * @param {boolean} args.isLastRow - Whether this is the last row
+     * @param {boolean} args.validationPositionResult - Validation position result
+     * @returns {void}
+     * @hidden
+     */
+    lastRowValidation(args) {
+        if (!this.parent.enableVirtualization) {
+            return;
+        }
+        const { isBeginEdit, isAddedRow, isLastRow } = args;
+        const newRowPosition = this.parent.editSettings.newRowPosition;
+        if ((newRowPosition === 'Child' || newRowPosition === 'Below' || newRowPosition === 'Above') &&
+            isAddedRow && isLastRow) {
+            args.validationPositionResult = true;
+        }
+        else if (isBeginEdit && isLastRow) {
+            args.validationPositionResult = true;
+        }
+    }
 }
 
 /**
@@ -14913,7 +14982,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 this.startIndex = lastIndex - this.parent.getRows().length;
                 this.endIndex = lastIndex;
             }
-            else if (this.parent.root.editSettings.newRowPosition !== 'Top' && this.parent.root.editModule.selectedIndex !== -1 || this.parent.root.editModule.selectedIndex !== -1) {
+            else if (this.parent.root.editModule.selectedIndex !== -1) {
                 this.startIndex += 1;
                 this.endIndex += 1;
             }
@@ -15390,8 +15459,10 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             const directVirtualRender = 'directVirtualRender';
             if (!this.parent[`${directVirtualRender}`]) { // with this property, columns are rendered without debouncing on horizontal scroll.
                 const preventEvent = 'preventEvent';
-                if (Browser.isIE && !isWheel && check && !this[`${preventEvent}`] && !this.parent.enableVirtualMaskRow) {
-                    this.parent.showSpinner();
+                if (!isWheel && check && !this[`${preventEvent}`] && !this.parent.enableVirtualMaskRow) {
+                    if (Browser.isIE) {
+                        this.parent.showSpinner();
+                    }
                 }
                 if (this.parent.enableVirtualMaskRow && !this[`${preventEvent}`]) {
                     setTimeout(() => {
@@ -15469,12 +15540,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             this.parent.root.scrollPosition = scrollArgs.offset;
         }
         const info = scrollArgs.sentinel;
+        const rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
+        const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         let treeGridParent = null;
         if (this.parent.clipboardModule && this.parent.clipboardModule['treeGridParent']) {
             treeGridParent = this.parent.clipboardModule['treeGridParent'];
         }
-        const rowHeight = parseInt(this.parent.getRowHeight().toString(), 10);
-        const outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         let content;
         if (!isNullOrUndefined(this.parent.contentModule)) {
             content = this.parent.getContent().querySelector('.e-content');
@@ -15741,6 +15812,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             const focusCell = 'focusCell';
             const restoreAdd = 'restoreAdd';
             const ensureSelectedRowPosition = 'ensureSelectedRowPosition';
+            if (this['pressedKey'] === 'downArrow' || this['pressedKey'] === 'upArrow') {
+                this['activeKey'] = this['pressedKey'];
+            }
             super[`${focusCell}`](e);
             const isAdd = 'isAdd';
             if (this[`${isAdd}`] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {