@syncfusion/ej2-navigations 29.1.41 → 29.2.4

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

@@ -2285,8 +2285,8 @@ let MenuBase = class MenuBase extends Component {
             ul.style.left = left + px;
         }
     }
-    getMenuWidth(cmenu, width, isRtl) {
-        const caretIcon = cmenu.getElementsByClassName(CARET)[0];
+    getMenuWidth(menuElement, width, isRtl) {
+        const caretIcon = menuElement.getElementsByClassName(CARET)[0];
         if (caretIcon) {
             width += parseInt(getComputedStyle(caretIcon)[isRtl ? 'marginRight' : 'marginLeft'], 10);
         }
@@ -4895,7 +4895,10 @@ let Toolbar = class Toolbar extends Component {
     }
     popupEleWidth(el) {
         el.style.position = 'absolute';
-        let elWidth = this.isVertical ? el.offsetHeight : el.offsetWidth;
+        const style = window.getComputedStyle(el);
+        let elWidth = this.isVertical
+            ? el.offsetHeight
+            : el.offsetWidth + parseFloat(style.marginLeft) + parseFloat(style.marginRight);
         const btnText = el.querySelector('.' + CLS_TBARBTNTEXT);
         if (el.classList.contains('e-tbtn-align') || el.classList.contains(CLS_TBARTEXT)) {
             const btn = el.children[0];
@@ -5521,6 +5524,10 @@ let Toolbar = class Toolbar extends Component {
         return isNullOrUndefined(ele.getAttribute('data-tabindex')) ? '-1' : ele.getAttribute('data-tabindex');
     }
     itemClick(e) {
+        const itemClosest = !isNullOrUndefined(closest(e.currentTarget, '.' + CLS_TEMPLATE));
+        if (itemClosest) {
+            return;
+        }
         this.activeEleSwitch(e.currentTarget);
     }
     activeEleSwitch(ele) {
@@ -12516,6 +12523,9 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         else {
             this.isFirstRender = true;
             this.renderChildNodes(currLi, expandChild, callback, null, isFromExpandAll);
+            if (isNullOrUndefined(this.expandChildren) || this.expandChildren.length === 0) {
+                return;
+            }
             const liEles = selectAll('.' + LISTITEM, currLi);
             for (let i = 0; i < liEles.length; i++) {
                 const id = this.getId(liEles[parseInt(i.toString(), 10)]);
@@ -13143,11 +13153,11 @@ let TreeView = TreeView_1 = class TreeView extends Component {
             removeClass(hoveredNode, HOVER);
         }
     }
-    getNodeData(currLi, fromDS) {
+    getNodeData(currLi, fromDS, dragData) {
         if (!isNullOrUndefined(currLi) && currLi.classList.contains(LISTITEM) &&
             !isNullOrUndefined(closest(currLi, '.' + CONTROL)) && closest(currLi, '.' + CONTROL).classList.contains(ROOT)) {
             const id = currLi.getAttribute('data-uid');
-            const text = this.getText(currLi, fromDS);
+            const text = this.getText(currLi, fromDS, dragData);
             const pNode = closest(currLi.parentNode, '.' + LISTITEM);
             const pid = pNode ? pNode.getAttribute('data-uid') : null;
             const selected = currLi.classList.contains(ACTIVE);
@@ -13166,12 +13176,12 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
         return { id: '', text: '', parentID: '', selected: false, expanded: false, isChecked: '', hasChildren: false };
     }
-    getText(currLi, fromDS) {
+    getText(currLi, fromDS, dragData) {
         if (fromDS) {
-            const nodeData = this.getNodeObject(currLi.getAttribute('data-uid'));
+            const nodeData = !isNullOrUndefined(dragData) ? dragData : this.getNodeObject(currLi.getAttribute('data-uid'));
             const level = parseFloat(currLi.getAttribute('aria-level'));
             const nodeFields = this.getFields(this.fields, level, 1);
-            return getValue(nodeFields.text, nodeData);
+            return !isNullOrUndefined(dragData) ? dragData.text : getValue(nodeFields.text, nodeData);
         }
         return select('.' + LISTTEXT, currLi).textContent;
     }
@@ -13724,8 +13734,9 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         if (this.fields.dataSource instanceof DataManager === false) {
             this.preventExpand = false;
         }
+        const dragData = isNullOrUndefined(dragObj) ? null : dragObj.dragData;
         for (let i = 0; i < liArray.length; i++) {
-            nodeData.push(this.getNode(liArray[parseInt(i.toString(), 10)]));
+            nodeData.push(this.getNodeData(this.getElement(liArray[parseInt(i.toString(), 10)]), true, dragData));
         }
         this.trigger('nodeDropped', this.getDragEvent(e.event, dragObj, dropTarget, e.target, e.dragData.draggedElement, null, level, drop));
         if (dragObj.element.id !== this.element.id) {
@@ -13840,7 +13851,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         const id = this.getId(dragLi);
         const removedData = dragObj.updateChildField(dragObj.treeData, dragObj.fields, id, null, null, true);
         const refId = this.getId(dropLi);
-        const index = this.getDataPos(this.treeData, this.fields, refId);
+        const index = refId ? this.getDataPos(this.treeData, this.fields, refId) : null;
         const parentId = this.getId(dropParentLi);
         if (this.dataType === 1) {
             this.updateField(this.treeData, this.fields, parentId, 'hasChildren', true);