@syncfusion/ej2-navigations 31.2.12 → 31.2.16

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

@@ -3815,6 +3815,10 @@ let Toolbar = class Toolbar extends Component {
     }
     docEvent(e) {
         const popEle = closest(e.target, '.e-popup');
+        if (this.popupTriggeredByToolbar) {
+            this.popupTriggeredByToolbar = false;
+            return;
+        }
         if (this.popObj && isVisible(this.popObj.element) && !popEle && this.overflowMode === 'Popup') {
             this.popObj.hide({ name: 'FadeOut', duration: 100 });
         }
@@ -4189,6 +4193,10 @@ let Toolbar = class Toolbar extends Component {
         const isPopupElement = !isNullOrUndefined(closest(trgt, '.' + CLS_POPUPCLASS));
         let clsList = trgt.classList;
         let popupNav = closest(trgt, ('.' + CLS_TBARNAV));
+        const popupDownIcon = closest(trgt, ('.' + CLS_POPUPDOWN));
+        if (popupDownIcon || popupNav) {
+            this.popupTriggeredByToolbar = true;
+        }
         if (!popupNav) {
             popupNav = trgt;
         }
@@ -11278,25 +11286,23 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         const childKey = typeof this.fields.child === 'string' ? this.fields.child : null;
         const dataId = this.fields.id;
         const parentKey = this.fields.parentID;
+        if (!this.nodeIndex) {
+            this.nodeIndex = new Map();
+            this.buildNodeIndex(this.treeData);
+        }
         const matchesDataUid = (childNode) => {
             if (!isNullOrUndefined(childKey) && childKey in childNode && Array.isArray(childNode[childKey])) {
                 const matchNode = childNode[dataId];
-                if (!isNullOrUndefined(matchNode)) {
-                    return matchNode.toString() === dataUid;
-                }
+                return !isNullOrUndefined(matchNode) &&
+                    matchNode.toString() === dataUid;
             }
             else {
                 const childNodePid = childNode[parentKey];
-                if (!isNullOrUndefined(childNodePid)) {
-                    return childNodePid.toString() === dataUid;
-                }
+                return !isNullOrUndefined(childNodePid) && childNodePid.toString() === dataUid;
             }
-            return false;
         };
         return this.checkedNodes
-            .map((checkedNodeId) => {
-            return this.getNodeObject(checkedNodeId);
-        })
+            .map((id) => this.nodeIndex.get(id))
             .filter((childNode) => {
             if (childNode && typeof childNode === 'object' && (childKey in childNode)) {
                 return matchesDataUid(childNode);
@@ -11307,6 +11313,24 @@ let TreeView = TreeView_1 = class TreeView extends Component {
             return false;
         });
     }
+    buildNodeIndex(nodes) {
+        const childKey = typeof this.fields.child === 'string' ? this.fields.child : null;
+        nodes.forEach((node) => {
+            const idVal = getValue(this.fields.id, node);
+            if (idVal != null) {
+                if (!this.nodeIndex) {
+                    this.nodeIndex = new Map();
+                }
+                this.nodeIndex.set(idVal.toString(), node);
+            }
+            if (childKey) {
+                const children = getValue(childKey, node);
+                if (Array.isArray(children)) {
+                    this.buildNodeIndex(children);
+                }
+            }
+        });
+    }
     getAllChildNodes(data, parentId) {
         if (isNullOrUndefined(data) || isNullOrUndefined(parentId)) {
             return [];