Skip to content

Commit a408798

Browse files
authored
Merge branch 'master' into dmdimitrov/fix-10391-master
2 parents bc888d2 + 8608eb2 commit a408798

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ All notable changes for each version of this project will be documented in this
5050
- Added `groupSortingDirection` input, which allows you to set groups sorting order.
5151
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
5252
- Added new directives for re-templating header sorting indicators - `IgxSortHeaderIconDirective`, `IgxSortAscendingHeaderIconDirective` and `IgxSortDescendingHeaderIconDirective`.
53+
- `IgxGrid`
54+
- Exposed a `groupStrategy` input that functions similarly to `sortStrategy`, allowing customization of the grouping behavior of the grid. Please, refer to the [Group By ](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/groupby) topic for more information.
5355
- `IgxDialog`
5456
- Added `focusTrap` input to set whether the Tab key focus is trapped within the dialog when opened. Defaults to `true`.
5557

@@ -101,8 +103,6 @@ All notable changes for each version of this project will be documented in this
101103
```
102104
- `IgxColumnActionsComponent`
103105
- **Breaking Change** - Input `columns` has been removed. Use `igxGrid` `columns` input instead.
104-
- `igxGrid`
105-
- Exposed a `groupStrategy` input that functions similarly to `sortStrategy`, allowing customization of the grouping behavior of the grid. Please, refer to the [Group By ](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/groupby) topic for more information.
106106
- `IgxCarousel`
107107
- **Breaking Changes** - The carousel animation type `CarouselAnimationType` is renamed to `HorizontalAnimationType`.
108108

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5764,7 +5764,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
57645764
* @hidden @internal
57655765
*/
57665766
public isSummaryRow(rowData): boolean {
5767-
return rowData.summaries && (rowData.summaries instanceof Map);
5767+
return rowData && rowData.summaries && (rowData.summaries instanceof Map);
57685768
}
57695769

57705770
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
598598
* @hidden @internal
599599
*/
600600
public isDetailRecord(record) {
601-
return record.detailsData !== undefined;
601+
return record && record.detailsData !== undefined;
602602
}
603603

604604
/**

0 commit comments

Comments
 (0)