@syncfusion/ej2-navigations 20.3.58 → 20.3.60

package/dist/es6/ej2-navigations.es5.js

@@ -11596,6 +11596,7 @@ var TreeView = /** @__PURE__ @class */ (function (_super) {
         return (typeof mapper.child === 'string' || isNullOrUndefined(mapper.child)) ? mapper : mapper.child;
     };
     TreeView.prototype.getChildNodes = function (obj, parentId, isRoot) {
+        var _this = this;
         if (isRoot === void 0) { isRoot = false; }
         var childNodes;
         if (isNullOrUndefined(obj)) {
@@ -11606,15 +11607,22 @@ var TreeView = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             if (typeof this.fields.child === 'string') {
-                for (var i = 0, objlen = obj.length; i < objlen; i++) {
-                    var dataId = getValue(this.fields.id, obj[i]);
-                    if (dataId && dataId.toString() === parentId) {
-                        return getValue(this.fields.child, obj[i]);
-                    }
-                    else if (!isNullOrUndefined(getValue(this.fields.child, obj[i]))) {
-                        childNodes = this.getChildNodes(getValue(this.fields.child, obj[i]), parentId);
-                        if (childNodes !== undefined) {
-                            break;
+                var index = obj.findIndex(function (data) { return data[_this.fields.id] && data[_this.fields.id].toString() === parentId; });
+                if (index !== -1) {
+                    return getValue(this.fields.child, obj[index]);
+                }
+                if (index === -1) {
+                    for (var i = 0, objlen = obj.length; i < objlen; i++) {
+                        var tempArray = getValue(this.fields.child, obj[i]);
+                        var childIndex = !isNullOrUndefined(tempArray) ? tempArray.findIndex(function (data) { return data[_this.fields.id] && data[_this.fields.id].toString() === parentId; }) : -1;
+                        if (childIndex !== -1) {
+                            return getValue(this.fields.child, tempArray[childIndex]);
+                        }
+                        else if (!isNullOrUndefined(tempArray)) {
+                            childNodes = this.getChildNodes(tempArray, parentId);
+                            if (childNodes !== undefined) {
+                                break;
+                            }
                         }
                     }
                 }
@@ -13413,7 +13421,7 @@ var TreeView = /** @__PURE__ @class */ (function (_super) {
         if (!isNullOrUndefined(dropLi)) {
             dropIcon1 = select('div.' + ICON, dropLi);
         }
-        if (this.dataType === 1 && dropIcon1 && dropIcon1.classList.contains(EXPANDABLE)) {
+        if (this.dataType === 1 && dropIcon1 && dropIcon1.classList.contains(EXPANDABLE) && !isNullOrUndefined(this.element.offsetParent) && !this.element.offsetParent.parentElement.classList.contains('e-filemanager')) {
             this.preventExpand = true;
         }
         if (this.dataType !== 1) {
@@ -13433,7 +13441,7 @@ var TreeView = /** @__PURE__ @class */ (function (_super) {
                 for (var i = 0; i < li.length; i++) {
                     dropUl.insertBefore(li[i], refNode);
                 }
-                if (this.dataType === 1 && !isNullOrUndefined(dropLi)) {
+                if (this.dataType === 1 && !isNullOrUndefined(dropLi) && !isNullOrUndefined(this.element.offsetParent) && !this.element.offsetParent.parentElement.classList.contains('e-filemanager')) {
                     this.preventExpand = false;
                     var dropIcon = select('div.' + ICON, dropLi);
                     if (dropIcon && dropIcon.classList.contains(EXPANDABLE)) {