@syncfusion/ej2-navigations 20.3.58 → 20.3.60

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.3.58
+*  version : 20.3.60
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-navigations@*",
-  "_id": "@syncfusion/ej2-navigations@20.3.57",
+  "_id": "@syncfusion/ej2-navigations@20.3.58",
   "_inBundle": false,
-  "_integrity": "sha512-rj+kdc64a6LVN5O58sjyKfcH37SLQnYxITd9VRoc2N+qhkn0XxRCDw+qAgfF8NQU25oHZlW2fy0jgW9tky/YQA==",
+  "_integrity": "sha512-6zlMWTfYP/IRcf1CK3sICjk6Zg+39jGz4+vSd5hve/o67YQJgmN6VjyuTJfJZkaiygoz2rbykc8ezItSGi8F7g==",
   "_location": "/@syncfusion/ej2-navigations",
   "_phantomChildren": {},
   "_requested": {
@@ -38,8 +38,8 @@
     "/@syncfusion/ej2-spreadsheet",
     "/@syncfusion/ej2-vue-navigations"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-navigations/-/ej2-navigations-20.3.57.tgz",
-  "_shasum": "288f223b59d58007b99707177429330fb6ce944e",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-navigations/-/ej2-navigations-20.3.58.tgz",
+  "_shasum": "7a99612f52201c19882ab87cd6c9764d2f3645e2",
   "_spec": "@syncfusion/ej2-navigations@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -52,10 +52,10 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~20.3.56",
     "@syncfusion/ej2-buttons": "~20.3.58",
-    "@syncfusion/ej2-data": "~20.3.56",
+    "@syncfusion/ej2-data": "~20.3.60",
     "@syncfusion/ej2-inputs": "~20.3.57",
     "@syncfusion/ej2-lists": "~20.3.56",
-    "@syncfusion/ej2-popups": "~20.3.58"
+    "@syncfusion/ej2-popups": "~20.3.60"
   },
   "deprecated": false,
   "description": "A package of Essential JS 2 navigation components such as Tree-view, Tab, Toolbar, Context-menu, and Accordion which is used to navigate from one page to another",
@@ -160,6 +160,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.3.58",
+  "version": "20.3.60",
   "sideEffects": false
 }

package/src/treeview/treeview.js

@@ -1857,6 +1857,7 @@ var TreeView = /** @class */ (function (_super) {
         return (typeof mapper.child === 'string' || isNOU(mapper.child)) ? mapper : mapper.child;
     };
     TreeView.prototype.getChildNodes = function (obj, parentId, isRoot) {
+        var _this = this;
         if (isRoot === void 0) { isRoot = false; }
         var childNodes;
         if (isNOU(obj)) {
@@ -1867,15 +1868,22 @@ var TreeView = /** @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 (!isNOU(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 = !isNOU(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 (!isNOU(tempArray)) {
+                            childNodes = this.getChildNodes(tempArray, parentId);
+                            if (childNodes !== undefined) {
+                                break;
+                            }
                         }
                     }
                 }
@@ -3675,7 +3683,7 @@ var TreeView = /** @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) && !isNOU(this.element.offsetParent) && !this.element.offsetParent.parentElement.classList.contains('e-filemanager')) {
             this.preventExpand = true;
         }
         if (this.dataType !== 1) {
@@ -3695,7 +3703,7 @@ var TreeView = /** @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) && !isNOU(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)) {