@syncfusion/ej2-treegrid 25.2.3 → 25.2.4

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

@@ -3446,6 +3446,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (!isNullOrUndefined(this.injectedModules[`${logger}`])) {
             Grid.Inject(Logger);
         }
+        const freezeModulePresent = this.injectedModules.filter((e) => {
+            if (e.prototype.getModuleName() === 'freeze') {
+                Grid.Inject(Freeze);
+            }
+        });
         this.grid = new Grid();
     }
     /**
@@ -3760,19 +3765,21 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     if (!this.enableVirtualization) {
                         target = e.target;
                         parentTarget = target.parentElement;
-                        const cellIndex = parentTarget.cellIndex;
-                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
-                            parentTarget = target;
-                        }
-                        summaryElement = this.findnextRowElement(parentTarget);
-                        if (summaryElement !== null) {
-                            const cellIndex = e.target.cellIndex;
-                            const row = summaryElement.children[parseInt(cellIndex.toString(), 10)];
-                            addClass([row], 'e-focused');
-                            addClass([row], 'e-focus');
-                        }
-                        else {
-                            this.clearSelection();
+                        if (!isNullOrUndefined(parentTarget)) {
+                            const cellIndex = parentTarget.cellIndex;
+                            if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                                parentTarget = target;
+                            }
+                            summaryElement = this.findnextRowElement(parentTarget);
+                            if (summaryElement !== null) {
+                                const cellIndex = e.target.cellIndex;
+                                const row = summaryElement.children[parseInt(cellIndex.toString(), 10)];
+                                addClass([row], 'e-focused');
+                                addClass([row], 'e-focus');
+                            }
+                            else {
+                                this.clearSelection();
+                            }
                         }
                     }
                     break;
@@ -3780,19 +3787,21 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     if (!this.enableVirtualization) {
                         target = e.target;
                         parentTarget = target.parentElement;
-                        const cellIndex = parentTarget.cellIndex;
-                        if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
-                            parentTarget = target;
-                        }
-                        summaryElement = this.findPreviousRowElement(parentTarget);
-                        if (summaryElement !== null) {
-                            const cIndex = e.target.cellIndex;
-                            const rows = summaryElement.children[parseInt(cIndex.toString(), 10)];
-                            addClass([rows], 'e-focused');
-                            addClass([rows], 'e-focus');
-                        }
-                        else {
-                            this.clearSelection();
+                        if (!isNullOrUndefined(parentTarget)) {
+                            const cellIndex = parentTarget.cellIndex;
+                            if (this.grid.getColumnByIndex(cellIndex).editType === 'dropdownedit' && isNullOrUndefined(this.grid.getColumnByIndex(cellIndex).edit['obj'])) {
+                                parentTarget = target;
+                            }
+                            summaryElement = this.findPreviousRowElement(parentTarget);
+                            if (summaryElement !== null) {
+                                const cIndex = e.target.cellIndex;
+                                const rows = summaryElement.children[parseInt(cIndex.toString(), 10)];
+                                addClass([rows], 'e-focused');
+                                addClass([rows], 'e-focus');
+                            }
+                            else {
+                                this.clearSelection();
+                            }
                         }
                     }
             }
@@ -6128,7 +6137,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (!this.isExpandingEventTriggered) {
                 this.trigger(expanding, args, (expandingArgs) => {
                     this.expandAllPrevent = expandingArgs.cancel;
-                    if (!expandingArgs.cancel) {
+                    if (!expandingArgs.cancel && !isNullOrUndefined(record)) {
                         if (expandingArgs.expandAll) {
                             this.expandCollapseAllChildren(record, 'expand', key, level);
                         }
@@ -6253,7 +6262,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         else if (!this.isCollapseAll || (this.isCollapseAll && isRemoteData(this))) {
             const args = { data: record, row: row, cancel: false };
             this.trigger(collapsing, args, (collapsingArgs) => {
-                if (!collapsingArgs.cancel) {
+                if (!collapsingArgs.cancel && !isNullOrUndefined(record)) {
                     this.collapseRows(row, record, parentRec, key);
                 }
             });
@@ -9658,12 +9667,17 @@ class ExcelExport$1 {
         if (!isNullOrUndefined(excelExportProperties)) {
             this.isCollapsedStatePersist = excelExportProperties.isCollapsedStatePersist;
         }
+        if (!isNullOrUndefined(excelExportProperties) && !isNullOrUndefined(excelExportProperties.dataSource)
+            && !isNullOrUndefined(excelExportProperties.dataSource instanceof DataManager)) {
+            return this.parent.grid.excelExportModule.Map(this.parent.grid, excelExportProperties, isMultipleExport, workbook, isCsv, isBlob);
+        }
         return new Promise((resolve) => {
             const dm = this.isLocal() && !(dataSource instanceof DataManager) ? new DataManager(dataSource)
                 : this.parent.dataSource;
             let query = new Query();
             if (!this.isLocal()) {
                 query = this.generateQuery(query);
+                query.queries = this.parent.grid.getDataModule().generateQuery().queries;
                 setValue('query', query, property);
             }
             this.parent.trigger(beforeExcelExport, extend(property, excelExportProperties));
@@ -12360,6 +12374,7 @@ class Edit$1 {
                     args.index = position === 'before' ? index : index + 1;
                 }
                 if (this.parent.editSettings.newRowPosition === 'Bottom') {
+                    level = 0;
                     const dataSource = (this.parent.grid.dataSource instanceof DataManager ?
                         this.parent.grid.dataSource.dataSource.json : this.parent.grid.dataSource);
                     args.index = dataSource.length;
@@ -13028,7 +13043,12 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             }
             if (firsttdinx === 0) {
                 this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
-                    scrollArgs.offset.top - (outBuffer * this.parent.getRowHeight()) + 10 : 0;
+                    scrollArgs.offset.top - (outBuffer * this.parent.getRowHeight()) + rowHeight : 0;
+            }
+            else if (this.parent.getFrozenColumns() > 0) {
+                scrollArgs.offset.top = scrollArgs.offset.top + 80;
+                this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
+                    scrollArgs.offset.top - (outBuffer * rowHeight) + 10 : 0;
             }
             else {
                 this.translateY = (scrollArgs.offset.top - (outBuffer * rowHeight) > 0) ?
@@ -13068,6 +13088,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     if (this.parent.allowRowDragAndDrop) {
                         this.translateY = scrollArgs.offset.top - rowHeight * 2;
                     }
+                    else if (this.parent.getFrozenColumns() > 0) {
+                        this.translateY = scrollArgs.offset.top - ((rowHeight * 2) + this.parent.pageSettings.pageSize);
+                    }
                     else {
                         this.translateY = scrollArgs.offset.top;
                     }
@@ -13385,15 +13408,11 @@ class VirtualScroll$1 {
                 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'])) {
-                const modifiedStartIndex = counts.startIndex + (counts.count - counts.endIndex);
-                if (counts.count - counts.startIndex <= this.parent.grid.pageSettings.pageSize) {
-                    startIndex = modifiedStartIndex;
+                if ((counts.endIndex + this.parent.pageSettings.pageSize >= counts.count && (this.parent.root && counts.count - counts.endIndex === this.visualData.length - this.parent.root['previousFlatData'].length))
+                    || !(this.parent['isGantt'] && this.parent['isAddedFromGantt'])) {
+                    startIndex = counts.startIndex + (counts.count - counts.endIndex);
                     endIndex = counts.count;
                 }
-                else {
-                    startIndex = counts.startIndex;
-                    endIndex = counts.endIndex;
-                }
                 this.parent['isAddedFromGantt'] = false;
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&