@syncfusion/ej2-treegrid 26.2.11 → 26.2.14

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

@@ -2478,7 +2478,17 @@ class DataManipulation {
             }
             if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
                 ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent))) {
-                currentData.hasChildRecords = true;
+                if (!isNullOrUndefined(currentData[this.parent.childMapping])) {
+                    if (currentData[this.parent.childMapping].length > 0) {
+                        currentData.hasChildRecords = true;
+                    }
+                    else {
+                        currentData.hasChildRecords = false;
+                    }
+                }
+                else {
+                    currentData.hasChildRecords = true;
+                }
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {
                     currentData.expanded = false;
@@ -4240,9 +4250,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (this.treeColumnIndex >= this.columns.length) {
             failureCases.push('TreeColumnIndex value should not exceed the total column count.');
         }
-        if (this.enableVirtualization && (!/[0-9]$/.test(this.columnModel.filter((col) => col.width).toString())
-            && !/[px]$/.test(this.columnModel.filter((col) => col.width).toString()))
-            || (/[0-9]$/.test(this.height.toString()) && /[px]$/.test(this.height.toString()))) {
+        if (this.enableVirtualization &&
+            (this.columnModel.some((col) => /%$/.test(col.width)) ||
+                /%$/.test(this.height.toString()))) {
             failureCases.push('column width and height should be in pixels');
         }
         if ((this.childMapping !== 'Children') && !isNullOrUndefined(this.idMapping)) {
@@ -5532,14 +5542,16 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (((target.classList.contains('e-flmenu-cancelbtn') || target.classList.contains('e-flmenu-okbtn')
             || target.classList.contains('e-content') || target.classList.contains('e-rowcell'))
             && !isNullOrUndefined(this.filterModule) && this.isReact)) {
-            if (this.grid.filterModule['column'].filterTemplate) {
-                const elem = document.getElementById(this.grid.filterModule.filterModule['dlgObj'].element.id);
-                this.grid.filterModule['fltrDlgDetails'].isOpen = false;
-                if (this.grid.filterModule.filterModule['dlgObj'] && !this.grid.filterModule.filterModule['dlgObj'].isDestroyed && elem) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    this.clearTemplate(['filterTemplate'], undefined, () => {
-                        this.grid.filterModule.filterModule['dlgObj'].destroy();
-                    });
+            if (!isNullOrUndefined(this.grid.filterModule['column'])) {
+                if (this.grid.filterModule['column'].filterTemplate) {
+                    const elem = document.getElementById(this.grid.filterModule.filterModule['dlgObj'].element.id);
+                    this.grid.filterModule['fltrDlgDetails'].isOpen = false;
+                    if (this.grid.filterModule.filterModule['dlgObj'] && !this.grid.filterModule.filterModule['dlgObj'].isDestroyed && elem) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        this.clearTemplate(['filterTemplate'], undefined, () => {
+                            this.grid.filterModule.filterModule['dlgObj'].destroy();
+                        });
+                    }
                 }
             }
         }