@syncfusion/ej2-treegrid 31.1.17 → 31.1.21

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

@@ -8952,9 +8952,18 @@ class RowDD {
             && !isNullOrUndefined(droppedRecord.taskData)) {
             const keys = Object.keys(temporaryDataSource);
             for (let i = 0; i < keys.length; i++) {
-                if (temporaryDataSource[parseInt(i.toString(), 10)][this.parent.childMapping] ===
-                    droppedRecord.taskData[this.parent.childMapping]) {
-                    indexOfDroppedRecord = i;
+                if (temporaryDataSource[parseInt(i.toString(), 10)][this.parent.childMapping]) {
+                    if (temporaryDataSource[parseInt(i.toString(), 10)][this.parent.childMapping] ===
+                        droppedRecord.taskData[this.parent.childMapping]) {
+                        indexOfDroppedRecord = i;
+                    }
+                }
+                else {
+                    const primaryKeyField = this.parent.getPrimaryKeyFieldNames()[0];
+                    if (temporaryDataSource[parseInt(i.toString(), 10)][`${primaryKeyField}`] ===
+                        droppedRecord.taskData[`${primaryKeyField}`]) {
+                        indexOfDroppedRecord = i;
+                    }
                 }
             }
             if (!this.parent.idMapping) {
@@ -13408,7 +13417,7 @@ class Edit {
             this.addRowRecord = this.parent.flatData[args.index];
             this.addRowIndex = args.index;
         }
-        if (this.parent.editSettings.newRowPosition === 'Child' && this.isIndexUndefined &&
+        if (this.parent.editSettings.newRowPosition === 'Child' && (this.isIndexUndefined || this.isAddedRowByMethod) &&
             !isNullOrUndefined(this.parent.getSelectedRecords()[0])) {
             this.addRowRecord = this.parent.getSelectedRecords()[0];
             this.isIndexUndefined = false;