Skip to content

Commit b9382e9

Browse files
authored
Merge branch 'master' into vkombov/changelog-11.0.0-update
2 parents 269695f + 3a323fe commit b9382e9

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
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/core/styles/themes/schemas/light/_button.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/// @type {Map}
1212
/// @prop {Color} shadow-color [transparent] - The shadow color of the button.
1313
/// @prop {Color} border-color [transparent] - The outline color of the button.
14-
/// @prop {Color} focus-border-color [transparent] - The focused border color of the button.
1514
/// @prop {Color} disabled-border-color [transparent] - The disabled border color of the button.
1615
/// @prop {Color} disabled-background [igx-color: ('grays', 300)] - The disabled background color of the button.
1716
/// @prop {Color} disabled-foreground [igx-color: ('grays', 500)] - The disabled foreground color of the button.
@@ -22,8 +21,6 @@ $material-base-button: (
2221

2322
border-color: transparent,
2423

25-
focus-border-color: transparent,
26-
2724
disabled-border-color: transparent,
2825

2926
disabled-background: (
@@ -80,7 +77,6 @@ $material-flat-button: extend(
8077

8178
/// @type {Map}
8279
/// @prop {Map} border-color [igx-color: ('secondary', 500)] - The outline color of the button.
83-
/// @prop {Map} focus-border-color [igx-color: ('grays', 300)] - The focused border color of the button.
8480
/// @prop {Map} disabled-border-color [igx-color: ('grays', 300)] - The disabled focused border color of the button.
8581
/// @requires {function} extend
8682
/// @requires {Map} $material-flat-button
@@ -90,11 +86,7 @@ $material-outlined-button: extend(
9086
selector: '[igxButton="outlined"], .igx-button--outlined',
9187

9288
border-color: (
93-
igx-color: ('secondary', 300)
94-
),
95-
96-
focus-border-color: (
97-
igx-color: ('grays', 300)
89+
igx-color: ('secondary', 500)
9890
),
9991

10092
disabled-border-color: (

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)