Skip to content

Commit 3149c97

Browse files
committed
Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mdragnev/pivot-selection
2 parents 7eda37a + 63aff6b commit 3149c97

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_chip.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $light-chip: extend(
5959
),
6060

6161
background: (
62-
igx-color: ('grays', 300)
62+
igx-color: ('grays', 400, .38)
6363
),
6464

6565
border-color: transparent,
@@ -73,7 +73,7 @@ $light-chip: extend(
7373
),
7474

7575
hover-background: (
76-
igx-color: ('grays', 400, .5)
76+
igx-color: ('grays', 400, .54)
7777
),
7878

7979
hover-border-color: transparent,
@@ -83,7 +83,7 @@ $light-chip: extend(
8383
),
8484

8585
focus-background: (
86-
igx-color: ('grays', 400, .5)
86+
igx-color: ('grays', 600, .54)
8787
),
8888

8989
focus-border-color: transparent,
@@ -93,7 +93,7 @@ $light-chip: extend(
9393
),
9494

9595
selected-background: (
96-
igx-color: ('grays', 300)
96+
igx-color: ('grays', 600, .38)
9797
),
9898

9999
selected-border-color: transparent,
@@ -103,7 +103,7 @@ $light-chip: extend(
103103
),
104104

105105
hover-selected-background: (
106-
igx-color: ('grays', 400, .8)
106+
igx-color: ('grays', 400, .54)
107107
),
108108

109109
hover-selected-border-color: transparent,
@@ -113,7 +113,7 @@ $light-chip: extend(
113113
),
114114

115115
focus-selected-background: (
116-
igx-color: ('grays', 400, .8)
116+
igx-color: ('grays', 600, .54)
117117
),
118118

119119
focus-selected-border-color: transparent

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
963963

964964
protected generateDimensionColumns(): IgxColumnComponent[] {
965965
const config = this.pivotConfiguration;
966-
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
966+
const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined);
967967
const leafFields = PivotUtil.flatten(allDimensions, 0).filter(x => !x.childLevel).map(x => x.memberName);
968968
const columns = [];
969969
const factory = this.resolver.resolveComponentFactory(IgxColumnComponent);

0 commit comments

Comments
 (0)