@syncfusion/ej2-base 20.3.49 → 20.3.50

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

@@ -7654,14 +7654,27 @@ let Draggable = Draggable_1 = class Draggable extends Base {
         }
         let draEleTop;
         let draEleLeft;
-        if (this.dragArea) {
-            this.dragLimit.top = this.clone ? this.dragLimit.top : 0;
-            draEleTop = (top - iTop) < 0 ? this.dragLimit.top : (top - this.borderWidth.top);
-            draEleLeft = (left - iLeft) < 0 ? this.dragLimit.left : (left - this.borderWidth.left);
+        if (this.helperElement.classList.contains('e-treeview')) {
+            if (this.dragArea) {
+                this.dragLimit.top = this.clone ? this.dragLimit.top : 0;
+                draEleTop = (top - iTop) < 0 ? this.dragLimit.top : (top - this.borderWidth.top);
+                draEleLeft = (left - iLeft) < 0 ? this.dragLimit.left : (left - this.borderWidth.left);
+            }
+            else {
+                draEleTop = top - this.borderWidth.top;
+                draEleLeft = left - this.borderWidth.left;
+            }
         }
         else {
-            draEleTop = top - this.borderWidth.top;
-            draEleLeft = left - this.borderWidth.left;
+            if (this.dragArea) {
+                this.dragLimit.top = this.clone ? this.dragLimit.top : 0;
+                draEleTop = (top - iTop) < 0 ? this.dragLimit.top : (top - iTop);
+                draEleLeft = (left - iLeft) < 0 ? this.dragElePosition.left : (left - iLeft);
+            }
+            else {
+                draEleTop = top - iTop;
+                draEleLeft = left - iLeft;
+            }
         }
         let marginTop = parseFloat(getComputedStyle(this.element).marginTop);
         // when drag-element has margin-top
@@ -7694,7 +7707,7 @@ let Draggable = Draggable_1 = class Draggable extends Base {
                 }
             }
         }
-        if (this.dragArea) {
+        if (this.dragArea && this.helperElement.classList.contains('e-treeview')) {
             let helperHeight = helperElement.offsetHeight + (parseFloat(styles.marginTop)
                 + parseFloat(styles.marginBottom));
             draEleTop = (draEleTop + helperHeight) > this.dragLimit.bottom ? (this.dragLimit.bottom - helperHeight) : draEleTop;
@@ -7768,7 +7781,7 @@ let Draggable = Draggable_1 = class Draggable extends Base {
             }
         }
         else if (nodeEle && nodeEle !== document.scrollingElement) {
-            if ((nodeEle.clientHeight + nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight + document.scrollingElement.scrollTop - this.borderWidth.top - this.borderWidth.bottom) <= draEleTop) {
+            if ((nodeEle.clientHeight + nodeEle.getBoundingClientRect().top - this.helperElement.clientHeight + document.scrollingElement.scrollTop) < draEleTop) {
                 nodeEle.scrollTop += this.helperElement.clientHeight;
             }
             else if (nodeEle.getBoundingClientRect().top > (draEleTop - this.helperElement.clientHeight - document.scrollingElement.scrollTop)) {
@@ -7874,7 +7887,7 @@ let Draggable = Draggable_1 = class Draggable extends Base {
         if (ele) {
             let elementArea = ele.getBoundingClientRect();
             eleWidthBound = ele.scrollWidth ? ele.scrollWidth : elementArea.right - elementArea.left;
-            eleHeightBound = ele.scrollHeight ? (this.dragArea && this.helperElement.classList.contains('e-treeview')) ? ele.clientHeight : ele.scrollHeight : elementArea.bottom - elementArea.top;
+            eleHeightBound = ele.scrollHeight ? (this.dragArea && !isNullOrUndefined(this.helperElement) && this.helperElement.classList.contains('e-treeview')) ? ele.clientHeight : ele.scrollHeight : elementArea.bottom - elementArea.top;
             let keys = ['Top', 'Left', 'Bottom', 'Right'];
             let styles = getComputedStyle(ele);
             for (let i = 0; i < keys.length; i++) {
@@ -7885,7 +7898,12 @@ let Draggable = Draggable_1 = class Draggable extends Base {
                 this.borderWidth[lowerKey] = isNaN(parseFloat(tborder)) ? 0 : parseFloat(tborder);
                 this.padding[lowerKey] = isNaN(parseFloat(tpadding)) ? 0 : parseFloat(tpadding);
             }
-            top = elementArea.top + document.scrollingElement.scrollTop;
+            if (this.dragArea && !isNullOrUndefined(this.helperElement) && this.helperElement.classList.contains('e-treeview')) {
+                top = elementArea.top + document.scrollingElement.scrollTop;
+            }
+            else {
+                top = elementArea.top;
+            }
             left = elementArea.left;
             this.dragLimit.left = left + this.borderWidth.left + this.padding.left;
             this.dragLimit.top = ele.offsetTop + this.borderWidth.top + this.padding.top;