@syncfusion/ej2-lists 33.1.47 → 34.1.29

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

@@ -4118,6 +4118,9 @@ var Virtualization = /** @__PURE__ @class */ (function () {
         var onChange = this.isNgTemplate() ? this.onNgChange : this.onChange;
         if (this.listViewInstance.template || this.listViewInstance.groupTemplate) {
             var 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);
@@ -4389,18 +4392,19 @@ var Sortable = /** @__PURE__ @class */ (function (_super) {
             if (dropInst.element.querySelector('.e-list-nrt')) {
                 curIdx = curIdx - 1;
             }
-            var sortableTargetElement = _this.getSortableElement(e.target, dropInst);
+            var sortableTargetElement = _this.getSortableElement(e.target, dropInst) || e.target.querySelector('.e-grabbed');
+            var 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)) {
                 var beforeDropArgs = {
                     previousIndex: prevIdx, currentIndex: curIdx,
                     target: e.target, droppedElement: _this.target, helper: e.helper, cancel: false
                 };
                 _this.trigger('beforeDrop', beforeDropArgs, function (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', {