Merge branch 'master' into PMiteva/disabled-textarea-6847

Author: Lipata

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

@@ -619,6 +619,9 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
     }
 
     public getDefaultExpandState(record: any) {
+        if (this.hasChildrenKey && !record[this.hasChildrenKey]) {
+            return false;
+        }
         return this.expandChildren;
 
     }

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts

@@ -433,6 +433,8 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
         hierarchicalGrid.expandRow(row2.rowData);
         expect(row1.expanded).toBe(false);
         expect(row2.expanded).toBe(true);
+        hierarchicalGrid.expandAll();
+        expect(row1.expanded).toBe(false);
     });
 
     it('should not expand children when hasChildrenKey is false for the row and there is primaryKey', () => {