Merge branch 'master' into mdragnev/fix-add-row-id

Author: Lipata

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -6659,7 +6659,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
                 if (args.cancel) {
                     return args.cancel;
                 }
-                this.gridAPI.addRowToData(row.data, this.addRowParent.asChild ? this.addRowParent.rowID : undefined);
+                const parentId = this._getParentRecordId();
+                this.gridAPI.addRowToData(row.data, parentId);
                 const doneArgs = row.createDoneEditEventArgs(cachedRowData);
                 this.rowEditDone.emit(doneArgs);
                 this.crudService.endRowEdit();
@@ -6685,6 +6686,14 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         return this.cancelAddMode;
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    protected _getParentRecordId() {
+        return this.addRowParent.asChild ? this.addRowParent.rowID : undefined;
+    }
+
     /**
      * @hidden
      * @internal

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-add-row-ui.spec.ts

@@ -92,5 +92,23 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
             const addRow = treeGrid.getRowByIndex(2);
             expect(addRow.addRow).toBeTrue();
         });
+
+        it('should allow adding sibling to child row via the API.', () => {
+            const row = treeGrid.rowList.toArray()[2] as IgxTreeGridRowComponent;
+            // adds row as sibling
+            row.beginAddRow();
+            fix.detectChanges();
+            endTransition();
+
+            treeGrid.endEdit(true);
+            fix.detectChanges();
+
+            // check row is added as sibling
+            expect(treeGrid.rowList.length).toBe(9);
+            const addedRow = treeGrid.rowList.toArray()[4] as IgxTreeGridRowComponent;
+            expect(addedRow.rowData.Name).toBe(undefined);
+            // should have same parent record.
+            expect(addedRow.treeRow.parent).toBe(row.treeRow.parent);
+        });
     });
 });

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts

@@ -519,6 +519,19 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         this.notifyChanges();
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    protected _getParentRecordId() {
+        if (this.addRowParent.asChild) {
+            return super._getParentRecordId();
+        } else {
+            const spawnedForRecord =  this._gridAPI.get_rec_by_id(this.addRowParent.rowID);
+            return spawnedForRecord.parent?.rowID;
+        }
+    }
+
     /** @hidden */
     public deleteRowById(rowId: any) {
         //  if this is flat self-referencing data, and CascadeOnDelete is set to true