Skip to content

Commit 06e81df

Browse files
committed
Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mdragnev/pivot-selection
2 parents 5720259 + 45bb975 commit 06e81df

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ All notable changes for each version of this project will be documented in this
5555
- `dragOver`
5656
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
5757
- Added new directives for re-templating header sorting indicators - `IgxSortHeaderIconDirective`, `IgxSortAscendingHeaderIconDirective` and `IgxSortDescendingHeaderIconDirective`.
58+
- `IgxGrid`
59+
- 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.
5860
- `IgxDialog`
5961
- Added `focusTrap` input to set whether the Tab key focus is trapped within the dialog when opened. Defaults to `true`.
6062

@@ -106,8 +108,6 @@ All notable changes for each version of this project will be documented in this
106108
```
107109
- `IgxColumnActionsComponent`
108110
- **Breaking Change** - Input `columns` has been removed. Use `igxGrid` `columns` input instead.
109-
- `igxGrid`
110-
- 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.
111111
- `IgxCarousel`
112112
- **Breaking Changes** - The carousel animation type `CarouselAnimationType` is renamed to `HorizontalAnimationType`.
113113

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
@@ -5766,7 +5766,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
57665766
* @hidden @internal
57675767
*/
57685768
public isSummaryRow(rowData): boolean {
5769-
return rowData.summaries && (rowData.summaries instanceof Map);
5769+
return rowData && rowData.summaries && (rowData.summaries instanceof Map);
57705770
}
57715771

57725772
/**

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
/**

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- Columns area -->
3131
<igx-chips-area #colArea droppable='true' style="width:fit-content; height: 100%;">
3232
<igx-chip *ngFor="let col of grid.columnDimensions" [draggable]="true" [id]="col.memberName"
33-
[removable]="true" (remove)="columnRemoved($event)"
33+
[removable]="true" (remove)="columnRemoved($event)"
3434
(dragOver)="onDimDragOver($event, 1)"
3535
(dragLeave)="onDimDragLeave($event)"
3636
(dragDrop)="onDimDrop($event, colArea, 1)"
@@ -80,7 +80,7 @@
8080
<div #pivotContainer class="igx-grid__tr-action" [style.min-width.px]="grid.pivotRowWidths"
8181
(igxDragEnter)="onAreaDragEnter($event, rowArea, 0)" (igxDragLeave)="onAreaDragLeave($event, rowArea)"
8282
igxDrop (dropped)="onDimDrop($event, rowArea, 0)" (pointerdown)="$event.preventDefault()"
83-
style='display: flex; align-items: flex-end;'>
83+
style='display: flex; align-items: flex-end; z-index: 4; background: inherit;'>
8484

8585
<div *ngIf="grid.rowDimensions.length === 0">
8686
<span class='igx-pivot__emptyChipArea'>Drop Row Fields here.</span>
@@ -147,4 +147,4 @@
147147
<igx-drop-down-item *ngFor="let item of aggregateList" [selected] ='isSelected(item)' [value]='item'>
148148
{{ item.label }}
149149
</igx-drop-down-item>
150-
</igx-drop-down>
150+
</igx-drop-down>

0 commit comments

Comments
 (0)