Merge branch 'master' into mpopov/outline-button-focus

zdrawku · web-flow · commit f6cd2e1c8e88 · 2021-11-22T12:02:43.000+02:00
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -5764,7 +5764,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
      * @hidden @internal
      */
     public isSummaryRow(rowData): boolean {
-        return rowData.summaries && (rowData.summaries instanceof Map);
+        return rowData && rowData.summaries && (rowData.summaries instanceof Map);
     }
 
     /**
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts
@@ -598,7 +598,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
      * @hidden @internal
      */
     public isDetailRecord(record) {
-        return record.detailsData !== undefined;
+        return record && record.detailsData !== undefined;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -5764,7 +5764,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements`
`5764`	`5764`	`* @hidden @internal`
`5765`	`5765`	`*/`
`5766`	`5766`	`public isSummaryRow(rowData): boolean {`
`5767`		`- return rowData.summaries && (rowData.summaries instanceof Map);`
	`5767`	`+ return rowData && rowData.summaries && (rowData.summaries instanceof Map);`
`5768`	`5768`	`}`
`5769`	`5769`
`5770`	`5770`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,`
`598`	`598`	`* @hidden @internal`
`599`	`599`	`*/`
`600`	`600`	`public isDetailRecord(record) {`
`601`		`- return record.detailsData !== undefined;`
	`601`	`+ return record && record.detailsData !== undefined;`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`/**`