@syncfusion/ej2-lists 33.1.47 → 34.1.29

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

@@ -4056,6 +4056,9 @@ class Virtualization {
         const onChange = this.isNgTemplate() ? this.onNgChange : this.onChange;
         if (this.listViewInstance.template || this.listViewInstance.groupTemplate) {
             const curViewDS = this.listViewInstance.curViewDS[index];
+            if (isNullOrUndefined(curViewDS)) {
+                return;
+            }
             element.dataset.uid = (curViewDS[this.listViewInstance.fields.id]) ?
                 (curViewDS[this.listViewInstance.fields.id]) : ListBase.generateId();
             onChange(curViewDS, element, this);
@@ -4313,18 +4316,19 @@ let Sortable = Sortable_1 = class Sortable extends Base {
             if (dropInst.element.querySelector('.e-list-nrt')) {
                 curIdx = curIdx - 1;
             }
-            const sortableTargetElement = this.getSortableElement(e.target, dropInst);
+            const sortableTargetElement = this.getSortableElement(e.target, dropInst) || e.target.querySelector('.e-grabbed');
+            const isDroppedOnContainer = dropInst.element === e.target && !sortableTargetElement;
             if (this.curTarget === this.target && sortableTargetElement === this.curTarget) {
                 curIdx = prevIdx;
             }
-            if (dropInst.element === e.target || (!isPlaceHolderPresent && this.curTarget === this.target)) {
+            if (isDroppedOnContainer || (!isPlaceHolderPresent && this.curTarget === this.target)) {
                 const beforeDropArgs = {
                     previousIndex: prevIdx, currentIndex: curIdx,
                     target: e.target, droppedElement: this.target, helper: e.helper, cancel: false
                 };
                 this.trigger('beforeDrop', beforeDropArgs, (observedArgs) => {
-                    if ((dropInst.element === e.target || (typeof e.target.className === 'string' && e.target.className.indexOf('e-list-nrt') > -1) || (typeof e.target.className === 'string' && e.target.className.indexOf('e-list-nr-template') > -1)
-                        || e.target.closest('.e-list-nr-template')) && !observedArgs.cancel) {
+                    if ((isDroppedOnContainer || (typeof sortableTargetElement.className === 'string' && sortableTargetElement.className.indexOf('e-list-nrt') > -1) || (typeof sortableTargetElement.className === 'string' && sortableTargetElement.className.indexOf('e-list-nr-template') > -1)
+                        || sortableTargetElement.closest('.e-list-nr-template')) && !observedArgs.cancel) {
                         this.updateItemClass(dropInst);
                         dropInst.element.appendChild(this.target);
                         this.trigger('drop', {