Merge branch 'master' into mkirova/fix-pinChip-mdv

Author: ChronosSF

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

@@ -1458,7 +1458,7 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
 
         });
 
-        it('should add pinned badge in the pinned row instance in the body', () => {
+        it('should add pinned chip in the pinned row instance in the body', () => {
             const rowToPin = treeGrid.getRowByIndex(0);
             const primaryKey = treeGrid.primaryKey;
 
@@ -1636,5 +1636,20 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
                 {ID: 475, Name: 'Michael Langdon'},
             ]);
         });
+
+        it('should remove the pinned chip for filtered out parent', () => {
+            treeGrid.pinRow(147);
+            fix.detectChanges();
+
+            treeGrid.filter('ID', 957, IgxStringFilteringOperand.instance().condition('contains'), false);
+            fix.detectChanges();
+
+            const firstColumnField = treeGrid.columns[0].field;
+            const pinnedChipExpectedPosition = treeGrid.getCellByColumn(1, firstColumnField);
+            const pinnedRow = pinnedChipExpectedPosition.row;
+
+            expect(pinnedChipExpectedPosition.nativeElement.getElementsByClassName('igx-grid__td--pinned-chip').length).toBe(0);
+            expect(pinnedRow.disabled).toBe(false);
+        });
     });
 });

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

@@ -612,7 +612,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
             $implicit: this.isGhostRecord(rowData) ? rowData.recordRef : rowData,
             index: this.getRowIndex(rowIndex, pinned),
             templateID: this.isSummaryRow(rowData) ? 'summaryRow' : 'dataRow',
-            disabled: this.isGhostRecord(rowData)
+            disabled: this.isGhostRecord(rowData) ? rowData.recordRef.isFilteredOutParent === undefined : false
         };
     }